diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3414dbc51e7..ef0b2f42e54 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,14 +55,17 @@ jobs:
       matrix:
         # We test Stripe SDK against Java LTS versions(8, 11, 17, 21) and currently supported non-LTS versions.
         # https://www.oracle.com/java/technologies/java-se-support-roadmap.html
+        # https://endoflife.date/oracle-jdk
         java-version:
+          # LTS versions
           - "1.8"
           - "11"
           - "17"
           - "21"
-          - "22"
-          - "23"
-          - "24"
+          - "25"
+          # non-LTS versions
+          # we should periodically add the latest non-LTS version here to test against
+          # as of 2025-09-29, the latest version of java (25) is LTS, so this section is empty. In March 2026, we'll add "26".
 
     steps:
       - uses: extractions/setup-just@v2
diff --git a/OPENAPI_VERSION b/OPENAPI_VERSION
index 8d0021ccb7a..c1d9350add0 100644
--- a/OPENAPI_VERSION
+++ b/OPENAPI_VERSION
@@ -1 +1 @@
-50fd01835dd5086df1533348c6688b14b9e50316
\ No newline at end of file
+50fd01835dd5086df1533348c6688b14b9e50316
diff --git a/README.md b/README.md
index be0dd4c4f1a..3cdb9b58178 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,13 @@ The official [Stripe][stripe] Java client library.
 
 ### Requirements
 
-- Java 1.8 or later
+We support LTS versions of the JDK. Currently, that's Java versions:
+
+- 8 (1.8)
+- 11
+- 17
+- 21
+- 25
 
 ### Gradle users
 
diff --git a/src/main/java/com/stripe/StripeClient.java b/src/main/java/com/stripe/StripeClient.java
index a58ab08a122..8031aa125ef 100644
--- a/src/main/java/com/stripe/StripeClient.java
+++ b/src/main/java/com/stripe/StripeClient.java
@@ -3,7 +3,7 @@
 import com.stripe.exception.SignatureVerificationException;
 import com.stripe.exception.StripeException;
 import com.stripe.model.StripeObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.net.*;
 import com.stripe.net.Webhook.Signature;
 import java.net.PasswordAuthentication;
diff --git a/src/main/java/com/stripe/model/v2/UnknownEventNotification.java b/src/main/java/com/stripe/events/UnknownEventNotification.java
similarity index 87%
rename from src/main/java/com/stripe/model/v2/UnknownEventNotification.java
rename to src/main/java/com/stripe/events/UnknownEventNotification.java
index f8f2e37559f..c70a4cca034 100644
--- a/src/main/java/com/stripe/model/v2/UnknownEventNotification.java
+++ b/src/main/java/com/stripe/events/UnknownEventNotification.java
@@ -1,9 +1,11 @@
-package com.stripe.model.v2;
+package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.StripeObject;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 /**
diff --git a/src/main/java/com/stripe/events/V1AccountUpdatedEvent.java b/src/main/java/com/stripe/events/V1AccountUpdatedEvent.java
index a0300b8070b..241760be511 100644
--- a/src/main/java/com/stripe/events/V1AccountUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1AccountUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Account;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1AccountUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1AccountUpdatedEventNotification.java
index bada4948038..1d4100ae6a9 100644
--- a/src/main/java/com/stripe/events/V1AccountUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1AccountUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Account;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ApplicationFeeCreatedEvent.java b/src/main/java/com/stripe/events/V1ApplicationFeeCreatedEvent.java
index 6091255de5f..80cdeb552e3 100644
--- a/src/main/java/com/stripe/events/V1ApplicationFeeCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1ApplicationFeeCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.ApplicationFee;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ApplicationFeeCreatedEventNotification.java b/src/main/java/com/stripe/events/V1ApplicationFeeCreatedEventNotification.java
index bd516647c69..d952d051d9b 100644
--- a/src/main/java/com/stripe/events/V1ApplicationFeeCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ApplicationFeeCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.ApplicationFee;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ApplicationFeeRefundedEvent.java b/src/main/java/com/stripe/events/V1ApplicationFeeRefundedEvent.java
index d96d0e0de3e..8f4ea0fd03a 100644
--- a/src/main/java/com/stripe/events/V1ApplicationFeeRefundedEvent.java
+++ b/src/main/java/com/stripe/events/V1ApplicationFeeRefundedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.ApplicationFee;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ApplicationFeeRefundedEventNotification.java b/src/main/java/com/stripe/events/V1ApplicationFeeRefundedEventNotification.java
index ffd8085b0c7..9df35ac3eac 100644
--- a/src/main/java/com/stripe/events/V1ApplicationFeeRefundedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ApplicationFeeRefundedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.ApplicationFee;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1BillingMeterErrorReportTriggeredEvent.java b/src/main/java/com/stripe/events/V1BillingMeterErrorReportTriggeredEvent.java
index 89ec7c14531..4be0b7018e3 100644
--- a/src/main/java/com/stripe/events/V1BillingMeterErrorReportTriggeredEvent.java
+++ b/src/main/java/com/stripe/events/V1BillingMeterErrorReportTriggeredEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.billing.Meter;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import java.time.Instant;
 import java.util.List;
 import lombok.Getter;
diff --git a/src/main/java/com/stripe/events/V1BillingMeterErrorReportTriggeredEventNotification.java b/src/main/java/com/stripe/events/V1BillingMeterErrorReportTriggeredEventNotification.java
index 367a95aa50f..986c1ddd0bf 100644
--- a/src/main/java/com/stripe/events/V1BillingMeterErrorReportTriggeredEventNotification.java
+++ b/src/main/java/com/stripe/events/V1BillingMeterErrorReportTriggeredEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.billing.Meter;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1BillingMeterNoMeterFoundEvent.java b/src/main/java/com/stripe/events/V1BillingMeterNoMeterFoundEvent.java
index 97b26534230..a1fc6e3bbf0 100644
--- a/src/main/java/com/stripe/events/V1BillingMeterNoMeterFoundEvent.java
+++ b/src/main/java/com/stripe/events/V1BillingMeterNoMeterFoundEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.time.Instant;
 import java.util.List;
 import lombok.Getter;
diff --git a/src/main/java/com/stripe/events/V1BillingMeterNoMeterFoundEventNotification.java b/src/main/java/com/stripe/events/V1BillingMeterNoMeterFoundEventNotification.java
index e533858cff0..84cbd1e2de1 100644
--- a/src/main/java/com/stripe/events/V1BillingMeterNoMeterFoundEventNotification.java
+++ b/src/main/java/com/stripe/events/V1BillingMeterNoMeterFoundEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V1BillingMeterNoMeterFoundEventNotification extends EventNotification {
   /** Retrieve the corresponding full event from the Stripe API. */
diff --git a/src/main/java/com/stripe/events/V1BillingPortalConfigurationCreatedEvent.java b/src/main/java/com/stripe/events/V1BillingPortalConfigurationCreatedEvent.java
index 58272a17ab8..fb3ad696556 100644
--- a/src/main/java/com/stripe/events/V1BillingPortalConfigurationCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1BillingPortalConfigurationCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.billingportal.Configuration;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1BillingPortalConfigurationCreatedEventNotification.java b/src/main/java/com/stripe/events/V1BillingPortalConfigurationCreatedEventNotification.java
index 562744ad88c..99d40475e1a 100644
--- a/src/main/java/com/stripe/events/V1BillingPortalConfigurationCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1BillingPortalConfigurationCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.billingportal.Configuration;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1BillingPortalConfigurationUpdatedEvent.java b/src/main/java/com/stripe/events/V1BillingPortalConfigurationUpdatedEvent.java
index 6dd9b299178..ef64577d52e 100644
--- a/src/main/java/com/stripe/events/V1BillingPortalConfigurationUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1BillingPortalConfigurationUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.billingportal.Configuration;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1BillingPortalConfigurationUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1BillingPortalConfigurationUpdatedEventNotification.java
index bdc62e39144..4685e45ba0b 100644
--- a/src/main/java/com/stripe/events/V1BillingPortalConfigurationUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1BillingPortalConfigurationUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.billingportal.Configuration;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CapabilityUpdatedEvent.java b/src/main/java/com/stripe/events/V1CapabilityUpdatedEvent.java
index fc01d669682..b62d9089c46 100644
--- a/src/main/java/com/stripe/events/V1CapabilityUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1CapabilityUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Capability;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CapabilityUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1CapabilityUpdatedEventNotification.java
index b8917639d04..9416d005287 100644
--- a/src/main/java/com/stripe/events/V1CapabilityUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CapabilityUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Capability;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeCapturedEvent.java b/src/main/java/com/stripe/events/V1ChargeCapturedEvent.java
index e9897958e50..4b188f32a79 100644
--- a/src/main/java/com/stripe/events/V1ChargeCapturedEvent.java
+++ b/src/main/java/com/stripe/events/V1ChargeCapturedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Charge;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeCapturedEventNotification.java b/src/main/java/com/stripe/events/V1ChargeCapturedEventNotification.java
index c736a03d0e7..0b9f511bce7 100644
--- a/src/main/java/com/stripe/events/V1ChargeCapturedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ChargeCapturedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Charge;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeDisputeClosedEvent.java b/src/main/java/com/stripe/events/V1ChargeDisputeClosedEvent.java
index b6cd9a8ffe6..5a92ccbb185 100644
--- a/src/main/java/com/stripe/events/V1ChargeDisputeClosedEvent.java
+++ b/src/main/java/com/stripe/events/V1ChargeDisputeClosedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Dispute;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeDisputeClosedEventNotification.java b/src/main/java/com/stripe/events/V1ChargeDisputeClosedEventNotification.java
index 6727a631841..62bcd48f1bf 100644
--- a/src/main/java/com/stripe/events/V1ChargeDisputeClosedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ChargeDisputeClosedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Dispute;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeDisputeCreatedEvent.java b/src/main/java/com/stripe/events/V1ChargeDisputeCreatedEvent.java
index cf731a50ba9..782d1243651 100644
--- a/src/main/java/com/stripe/events/V1ChargeDisputeCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1ChargeDisputeCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Dispute;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeDisputeCreatedEventNotification.java b/src/main/java/com/stripe/events/V1ChargeDisputeCreatedEventNotification.java
index bd757038841..537f9c063e4 100644
--- a/src/main/java/com/stripe/events/V1ChargeDisputeCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ChargeDisputeCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Dispute;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeDisputeFundsReinstatedEvent.java b/src/main/java/com/stripe/events/V1ChargeDisputeFundsReinstatedEvent.java
index c6b1839812a..8147430d50a 100644
--- a/src/main/java/com/stripe/events/V1ChargeDisputeFundsReinstatedEvent.java
+++ b/src/main/java/com/stripe/events/V1ChargeDisputeFundsReinstatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Dispute;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeDisputeFundsReinstatedEventNotification.java b/src/main/java/com/stripe/events/V1ChargeDisputeFundsReinstatedEventNotification.java
index 4e50b064a24..bb1e7a44b5b 100644
--- a/src/main/java/com/stripe/events/V1ChargeDisputeFundsReinstatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ChargeDisputeFundsReinstatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Dispute;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeDisputeFundsWithdrawnEvent.java b/src/main/java/com/stripe/events/V1ChargeDisputeFundsWithdrawnEvent.java
index f49125ef922..90fd25019ca 100644
--- a/src/main/java/com/stripe/events/V1ChargeDisputeFundsWithdrawnEvent.java
+++ b/src/main/java/com/stripe/events/V1ChargeDisputeFundsWithdrawnEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Dispute;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeDisputeFundsWithdrawnEventNotification.java b/src/main/java/com/stripe/events/V1ChargeDisputeFundsWithdrawnEventNotification.java
index fed34bef73c..f8e02c6a119 100644
--- a/src/main/java/com/stripe/events/V1ChargeDisputeFundsWithdrawnEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ChargeDisputeFundsWithdrawnEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Dispute;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeDisputeUpdatedEvent.java b/src/main/java/com/stripe/events/V1ChargeDisputeUpdatedEvent.java
index ab6db6a28b5..dc8476c00ca 100644
--- a/src/main/java/com/stripe/events/V1ChargeDisputeUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1ChargeDisputeUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Dispute;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeDisputeUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1ChargeDisputeUpdatedEventNotification.java
index 43317e7f5e7..6802f31b5a7 100644
--- a/src/main/java/com/stripe/events/V1ChargeDisputeUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ChargeDisputeUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Dispute;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeExpiredEvent.java b/src/main/java/com/stripe/events/V1ChargeExpiredEvent.java
index befe0ea883b..4364d5c493a 100644
--- a/src/main/java/com/stripe/events/V1ChargeExpiredEvent.java
+++ b/src/main/java/com/stripe/events/V1ChargeExpiredEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Charge;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeExpiredEventNotification.java b/src/main/java/com/stripe/events/V1ChargeExpiredEventNotification.java
index 244c53d9ae8..c67a9771254 100644
--- a/src/main/java/com/stripe/events/V1ChargeExpiredEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ChargeExpiredEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Charge;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeFailedEvent.java b/src/main/java/com/stripe/events/V1ChargeFailedEvent.java
index f5c75522b61..b4060c85eda 100644
--- a/src/main/java/com/stripe/events/V1ChargeFailedEvent.java
+++ b/src/main/java/com/stripe/events/V1ChargeFailedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Charge;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeFailedEventNotification.java b/src/main/java/com/stripe/events/V1ChargeFailedEventNotification.java
index 85fcaa2222f..19bb1a5ced4 100644
--- a/src/main/java/com/stripe/events/V1ChargeFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ChargeFailedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Charge;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargePendingEvent.java b/src/main/java/com/stripe/events/V1ChargePendingEvent.java
index 007e4c2878a..de69ce91c4d 100644
--- a/src/main/java/com/stripe/events/V1ChargePendingEvent.java
+++ b/src/main/java/com/stripe/events/V1ChargePendingEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Charge;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargePendingEventNotification.java b/src/main/java/com/stripe/events/V1ChargePendingEventNotification.java
index 5ec86223eb2..fd2507618d5 100644
--- a/src/main/java/com/stripe/events/V1ChargePendingEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ChargePendingEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Charge;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeRefundUpdatedEvent.java b/src/main/java/com/stripe/events/V1ChargeRefundUpdatedEvent.java
index 4c268758fe9..f2780501397 100644
--- a/src/main/java/com/stripe/events/V1ChargeRefundUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1ChargeRefundUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Refund;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeRefundUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1ChargeRefundUpdatedEventNotification.java
index 1def83328b4..f8c71829bcc 100644
--- a/src/main/java/com/stripe/events/V1ChargeRefundUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ChargeRefundUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Refund;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeRefundedEvent.java b/src/main/java/com/stripe/events/V1ChargeRefundedEvent.java
index 6dc0330e5cd..7ba06af6437 100644
--- a/src/main/java/com/stripe/events/V1ChargeRefundedEvent.java
+++ b/src/main/java/com/stripe/events/V1ChargeRefundedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Charge;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeRefundedEventNotification.java b/src/main/java/com/stripe/events/V1ChargeRefundedEventNotification.java
index d278c5fc87a..abeb5003de6 100644
--- a/src/main/java/com/stripe/events/V1ChargeRefundedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ChargeRefundedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Charge;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeSucceededEvent.java b/src/main/java/com/stripe/events/V1ChargeSucceededEvent.java
index becb7c08501..25d20f3b0f6 100644
--- a/src/main/java/com/stripe/events/V1ChargeSucceededEvent.java
+++ b/src/main/java/com/stripe/events/V1ChargeSucceededEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Charge;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeSucceededEventNotification.java b/src/main/java/com/stripe/events/V1ChargeSucceededEventNotification.java
index a31f84b117f..f40de390434 100644
--- a/src/main/java/com/stripe/events/V1ChargeSucceededEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ChargeSucceededEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Charge;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeUpdatedEvent.java b/src/main/java/com/stripe/events/V1ChargeUpdatedEvent.java
index e4fb3fa51c5..dd26f6cb75b 100644
--- a/src/main/java/com/stripe/events/V1ChargeUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1ChargeUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Charge;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ChargeUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1ChargeUpdatedEventNotification.java
index c0e5965ef20..983cab11bc5 100644
--- a/src/main/java/com/stripe/events/V1ChargeUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ChargeUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Charge;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentFailedEvent.java b/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentFailedEvent.java
index d134ff1bcf4..b73f8ec54ee 100644
--- a/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentFailedEvent.java
+++ b/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentFailedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.checkout.Session;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentFailedEventNotification.java b/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentFailedEventNotification.java
index bee2a9c48e2..8ec5e0ae1fc 100644
--- a/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentFailedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.checkout.Session;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentSucceededEvent.java b/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentSucceededEvent.java
index c6073d853eb..023e0040492 100644
--- a/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentSucceededEvent.java
+++ b/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentSucceededEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.checkout.Session;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentSucceededEventNotification.java b/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentSucceededEventNotification.java
index fe4ef6316de..2da0e41c975 100644
--- a/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentSucceededEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CheckoutSessionAsyncPaymentSucceededEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.checkout.Session;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CheckoutSessionCompletedEvent.java b/src/main/java/com/stripe/events/V1CheckoutSessionCompletedEvent.java
index d2bbe9e0240..5978e04e169 100644
--- a/src/main/java/com/stripe/events/V1CheckoutSessionCompletedEvent.java
+++ b/src/main/java/com/stripe/events/V1CheckoutSessionCompletedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.checkout.Session;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CheckoutSessionCompletedEventNotification.java b/src/main/java/com/stripe/events/V1CheckoutSessionCompletedEventNotification.java
index b825ebd042d..e3452e19f21 100644
--- a/src/main/java/com/stripe/events/V1CheckoutSessionCompletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CheckoutSessionCompletedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.checkout.Session;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CheckoutSessionExpiredEvent.java b/src/main/java/com/stripe/events/V1CheckoutSessionExpiredEvent.java
index a36016e9147..8126278034a 100644
--- a/src/main/java/com/stripe/events/V1CheckoutSessionExpiredEvent.java
+++ b/src/main/java/com/stripe/events/V1CheckoutSessionExpiredEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.checkout.Session;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CheckoutSessionExpiredEventNotification.java b/src/main/java/com/stripe/events/V1CheckoutSessionExpiredEventNotification.java
index 234984cfa48..6d36b532174 100644
--- a/src/main/java/com/stripe/events/V1CheckoutSessionExpiredEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CheckoutSessionExpiredEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.checkout.Session;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ClimateOrderCanceledEvent.java b/src/main/java/com/stripe/events/V1ClimateOrderCanceledEvent.java
index 9073ee1b8b7..12503f6be6c 100644
--- a/src/main/java/com/stripe/events/V1ClimateOrderCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V1ClimateOrderCanceledEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.climate.Order;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ClimateOrderCanceledEventNotification.java b/src/main/java/com/stripe/events/V1ClimateOrderCanceledEventNotification.java
index f2c5e7a7863..ddaf1658dad 100644
--- a/src/main/java/com/stripe/events/V1ClimateOrderCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ClimateOrderCanceledEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.climate.Order;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ClimateOrderCreatedEvent.java b/src/main/java/com/stripe/events/V1ClimateOrderCreatedEvent.java
index 37b06f88822..9949005ff38 100644
--- a/src/main/java/com/stripe/events/V1ClimateOrderCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1ClimateOrderCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.climate.Order;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ClimateOrderCreatedEventNotification.java b/src/main/java/com/stripe/events/V1ClimateOrderCreatedEventNotification.java
index f83cab7d9af..0e9e5fcf258 100644
--- a/src/main/java/com/stripe/events/V1ClimateOrderCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ClimateOrderCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.climate.Order;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ClimateOrderDelayedEvent.java b/src/main/java/com/stripe/events/V1ClimateOrderDelayedEvent.java
index d3cb4f2e808..20d98310980 100644
--- a/src/main/java/com/stripe/events/V1ClimateOrderDelayedEvent.java
+++ b/src/main/java/com/stripe/events/V1ClimateOrderDelayedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.climate.Order;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ClimateOrderDelayedEventNotification.java b/src/main/java/com/stripe/events/V1ClimateOrderDelayedEventNotification.java
index f6c7d6be9be..2057dafccb3 100644
--- a/src/main/java/com/stripe/events/V1ClimateOrderDelayedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ClimateOrderDelayedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.climate.Order;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ClimateOrderDeliveredEvent.java b/src/main/java/com/stripe/events/V1ClimateOrderDeliveredEvent.java
index 233e6a4e3eb..f68a47d51f4 100644
--- a/src/main/java/com/stripe/events/V1ClimateOrderDeliveredEvent.java
+++ b/src/main/java/com/stripe/events/V1ClimateOrderDeliveredEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.climate.Order;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ClimateOrderDeliveredEventNotification.java b/src/main/java/com/stripe/events/V1ClimateOrderDeliveredEventNotification.java
index 86e35e3b481..63448e2a7b0 100644
--- a/src/main/java/com/stripe/events/V1ClimateOrderDeliveredEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ClimateOrderDeliveredEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.climate.Order;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ClimateOrderProductSubstitutedEvent.java b/src/main/java/com/stripe/events/V1ClimateOrderProductSubstitutedEvent.java
index 8e1870f4bee..761d913c7dd 100644
--- a/src/main/java/com/stripe/events/V1ClimateOrderProductSubstitutedEvent.java
+++ b/src/main/java/com/stripe/events/V1ClimateOrderProductSubstitutedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.climate.Order;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ClimateOrderProductSubstitutedEventNotification.java b/src/main/java/com/stripe/events/V1ClimateOrderProductSubstitutedEventNotification.java
index 4f980f1f517..c45c4e83d55 100644
--- a/src/main/java/com/stripe/events/V1ClimateOrderProductSubstitutedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ClimateOrderProductSubstitutedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.climate.Order;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ClimateProductCreatedEvent.java b/src/main/java/com/stripe/events/V1ClimateProductCreatedEvent.java
index d54d6fa94db..f9ac7e97b28 100644
--- a/src/main/java/com/stripe/events/V1ClimateProductCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1ClimateProductCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.climate.Product;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ClimateProductCreatedEventNotification.java b/src/main/java/com/stripe/events/V1ClimateProductCreatedEventNotification.java
index 24663d617b9..f3534bdfe8f 100644
--- a/src/main/java/com/stripe/events/V1ClimateProductCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ClimateProductCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.climate.Product;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ClimateProductPricingUpdatedEvent.java b/src/main/java/com/stripe/events/V1ClimateProductPricingUpdatedEvent.java
index 3b253749982..0b62d7867b1 100644
--- a/src/main/java/com/stripe/events/V1ClimateProductPricingUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1ClimateProductPricingUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.climate.Product;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ClimateProductPricingUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1ClimateProductPricingUpdatedEventNotification.java
index 654a10d5b02..62533583144 100644
--- a/src/main/java/com/stripe/events/V1ClimateProductPricingUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ClimateProductPricingUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.climate.Product;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CouponCreatedEvent.java b/src/main/java/com/stripe/events/V1CouponCreatedEvent.java
index 05cc5a216a9..b4d917750e3 100644
--- a/src/main/java/com/stripe/events/V1CouponCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1CouponCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Coupon;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CouponCreatedEventNotification.java b/src/main/java/com/stripe/events/V1CouponCreatedEventNotification.java
index 916b7a95a06..87ec8aa5484 100644
--- a/src/main/java/com/stripe/events/V1CouponCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CouponCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Coupon;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CouponDeletedEvent.java b/src/main/java/com/stripe/events/V1CouponDeletedEvent.java
index 144eb53e3f7..d7fff8f512a 100644
--- a/src/main/java/com/stripe/events/V1CouponDeletedEvent.java
+++ b/src/main/java/com/stripe/events/V1CouponDeletedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Coupon;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CouponDeletedEventNotification.java b/src/main/java/com/stripe/events/V1CouponDeletedEventNotification.java
index 1a6467532a1..9052d1a34fa 100644
--- a/src/main/java/com/stripe/events/V1CouponDeletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CouponDeletedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Coupon;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CouponUpdatedEvent.java b/src/main/java/com/stripe/events/V1CouponUpdatedEvent.java
index dd210cbc837..ab06cd9291c 100644
--- a/src/main/java/com/stripe/events/V1CouponUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1CouponUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Coupon;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CouponUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1CouponUpdatedEventNotification.java
index a155f4738f5..ffe32ff4332 100644
--- a/src/main/java/com/stripe/events/V1CouponUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CouponUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Coupon;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CreditNoteCreatedEvent.java b/src/main/java/com/stripe/events/V1CreditNoteCreatedEvent.java
index f1f150184aa..15ca5e3c76a 100644
--- a/src/main/java/com/stripe/events/V1CreditNoteCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1CreditNoteCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.CreditNote;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CreditNoteCreatedEventNotification.java b/src/main/java/com/stripe/events/V1CreditNoteCreatedEventNotification.java
index d315d00e97c..8466d9bd310 100644
--- a/src/main/java/com/stripe/events/V1CreditNoteCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CreditNoteCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.CreditNote;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CreditNoteUpdatedEvent.java b/src/main/java/com/stripe/events/V1CreditNoteUpdatedEvent.java
index 58821d1a5bc..71171ada379 100644
--- a/src/main/java/com/stripe/events/V1CreditNoteUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1CreditNoteUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.CreditNote;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CreditNoteUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1CreditNoteUpdatedEventNotification.java
index da4547582af..40b310a984c 100644
--- a/src/main/java/com/stripe/events/V1CreditNoteUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CreditNoteUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.CreditNote;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CreditNoteVoidedEvent.java b/src/main/java/com/stripe/events/V1CreditNoteVoidedEvent.java
index 0abdb0fe2f6..09d57cc5b6c 100644
--- a/src/main/java/com/stripe/events/V1CreditNoteVoidedEvent.java
+++ b/src/main/java/com/stripe/events/V1CreditNoteVoidedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.CreditNote;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CreditNoteVoidedEventNotification.java b/src/main/java/com/stripe/events/V1CreditNoteVoidedEventNotification.java
index cc698557131..ab4a29b2501 100644
--- a/src/main/java/com/stripe/events/V1CreditNoteVoidedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CreditNoteVoidedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.CreditNote;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerCreatedEvent.java b/src/main/java/com/stripe/events/V1CustomerCreatedEvent.java
index 33b477b4ca8..4298e7a959e 100644
--- a/src/main/java/com/stripe/events/V1CustomerCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1CustomerCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Customer;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerCreatedEventNotification.java b/src/main/java/com/stripe/events/V1CustomerCreatedEventNotification.java
index 272c7523dcd..da9d426ee54 100644
--- a/src/main/java/com/stripe/events/V1CustomerCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CustomerCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Customer;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerDeletedEvent.java b/src/main/java/com/stripe/events/V1CustomerDeletedEvent.java
index ea7156d579e..efeeb3e4ffe 100644
--- a/src/main/java/com/stripe/events/V1CustomerDeletedEvent.java
+++ b/src/main/java/com/stripe/events/V1CustomerDeletedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Customer;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerDeletedEventNotification.java b/src/main/java/com/stripe/events/V1CustomerDeletedEventNotification.java
index 4c5debf96e0..3d6b84e961a 100644
--- a/src/main/java/com/stripe/events/V1CustomerDeletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CustomerDeletedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Customer;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionCreatedEvent.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionCreatedEvent.java
index 8b772b2d54c..e8ca36e76bf 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionCreatedEventNotification.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionCreatedEventNotification.java
index 2a1c9196d2d..7272eec08ed 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionDeletedEvent.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionDeletedEvent.java
index cf40cad2f7b..f367f19c947 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionDeletedEvent.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionDeletedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionDeletedEventNotification.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionDeletedEventNotification.java
index a6255470da9..1c9326c1f2e 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionDeletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionDeletedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionPausedEvent.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionPausedEvent.java
index 33a03b166e7..f5340aa46af 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionPausedEvent.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionPausedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionPausedEventNotification.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionPausedEventNotification.java
index 3e86c4815ca..03a1d09f347 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionPausedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionPausedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateAppliedEvent.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateAppliedEvent.java
index 82b16e35924..e874daa6f9f 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateAppliedEvent.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateAppliedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateAppliedEventNotification.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateAppliedEventNotification.java
index 6803d6698d2..259c71406b7 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateAppliedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateAppliedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateExpiredEvent.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateExpiredEvent.java
index 08c20034455..d84c392e409 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateExpiredEvent.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateExpiredEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateExpiredEventNotification.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateExpiredEventNotification.java
index 78dc248a775..688c7d6fae0 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateExpiredEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionPendingUpdateExpiredEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionResumedEvent.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionResumedEvent.java
index ab8d670d98f..a1bbbbc0d84 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionResumedEvent.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionResumedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionResumedEventNotification.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionResumedEventNotification.java
index 195d850dcf7..56c8c6c191d 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionResumedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionResumedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionTrialWillEndEvent.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionTrialWillEndEvent.java
index 1a2cd76b20f..adcec20024f 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionTrialWillEndEvent.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionTrialWillEndEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionTrialWillEndEventNotification.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionTrialWillEndEventNotification.java
index ec9a8dfa486..f03859bf52a 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionTrialWillEndEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionTrialWillEndEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionUpdatedEvent.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionUpdatedEvent.java
index 5f552364211..291128dc3ea 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerSubscriptionUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1CustomerSubscriptionUpdatedEventNotification.java
index bdb57c7cf2d..912d0431ca6 100644
--- a/src/main/java/com/stripe/events/V1CustomerSubscriptionUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CustomerSubscriptionUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Subscription;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerTaxIdCreatedEvent.java b/src/main/java/com/stripe/events/V1CustomerTaxIdCreatedEvent.java
index 4eac7846b27..6c0fa2593a2 100644
--- a/src/main/java/com/stripe/events/V1CustomerTaxIdCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1CustomerTaxIdCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.TaxId;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerTaxIdCreatedEventNotification.java b/src/main/java/com/stripe/events/V1CustomerTaxIdCreatedEventNotification.java
index cbaf94f5ce5..96cb76ccf5b 100644
--- a/src/main/java/com/stripe/events/V1CustomerTaxIdCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CustomerTaxIdCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.TaxId;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerTaxIdDeletedEvent.java b/src/main/java/com/stripe/events/V1CustomerTaxIdDeletedEvent.java
index 6267c7c0b2e..00520fa52fc 100644
--- a/src/main/java/com/stripe/events/V1CustomerTaxIdDeletedEvent.java
+++ b/src/main/java/com/stripe/events/V1CustomerTaxIdDeletedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.TaxId;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerTaxIdDeletedEventNotification.java b/src/main/java/com/stripe/events/V1CustomerTaxIdDeletedEventNotification.java
index 8cb4818daa4..0d8f18c7ce3 100644
--- a/src/main/java/com/stripe/events/V1CustomerTaxIdDeletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CustomerTaxIdDeletedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.TaxId;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerTaxIdUpdatedEvent.java b/src/main/java/com/stripe/events/V1CustomerTaxIdUpdatedEvent.java
index 6079ecc2a34..dcd752a16ab 100644
--- a/src/main/java/com/stripe/events/V1CustomerTaxIdUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1CustomerTaxIdUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.TaxId;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerTaxIdUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1CustomerTaxIdUpdatedEventNotification.java
index 9b506f2bb1b..aa996aee3b1 100644
--- a/src/main/java/com/stripe/events/V1CustomerTaxIdUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CustomerTaxIdUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.TaxId;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerUpdatedEvent.java b/src/main/java/com/stripe/events/V1CustomerUpdatedEvent.java
index 60fbb951f16..42b9831fc79 100644
--- a/src/main/java/com/stripe/events/V1CustomerUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1CustomerUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Customer;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1CustomerUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1CustomerUpdatedEventNotification.java
index 5c5e37b7da0..dc8f0ebb9be 100644
--- a/src/main/java/com/stripe/events/V1CustomerUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1CustomerUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Customer;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FileCreatedEvent.java b/src/main/java/com/stripe/events/V1FileCreatedEvent.java
index c5b868f49d1..51047f446db 100644
--- a/src/main/java/com/stripe/events/V1FileCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1FileCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.File;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FileCreatedEventNotification.java b/src/main/java/com/stripe/events/V1FileCreatedEventNotification.java
index 3c58dcf2b0e..f38648d89cf 100644
--- a/src/main/java/com/stripe/events/V1FileCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1FileCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.File;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountCreatedEvent.java b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountCreatedEvent.java
index 35b3164d95b..c0b6d81ab2f 100644
--- a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.financialconnections.Account;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountCreatedEventNotification.java b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountCreatedEventNotification.java
index 555594dd052..1dc30974e42 100644
--- a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.financialconnections.Account;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDeactivatedEvent.java b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDeactivatedEvent.java
index e08291cb1dd..c32b5f5c21d 100644
--- a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDeactivatedEvent.java
+++ b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDeactivatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.financialconnections.Account;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDeactivatedEventNotification.java b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDeactivatedEventNotification.java
index e2cbd1a7554..0ecc289e919 100644
--- a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDeactivatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDeactivatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.financialconnections.Account;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDisconnectedEvent.java b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDisconnectedEvent.java
index f6ab77ac28b..18a4202ef58 100644
--- a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDisconnectedEvent.java
+++ b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDisconnectedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.financialconnections.Account;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDisconnectedEventNotification.java b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDisconnectedEventNotification.java
index b1913996d0c..071c39fae49 100644
--- a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDisconnectedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountDisconnectedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.financialconnections.Account;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountReactivatedEvent.java b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountReactivatedEvent.java
index 1876efbad70..d7cf0afef81 100644
--- a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountReactivatedEvent.java
+++ b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountReactivatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.financialconnections.Account;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountReactivatedEventNotification.java b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountReactivatedEventNotification.java
index 04978a9d8f7..7128e9e9fe2 100644
--- a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountReactivatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountReactivatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.financialconnections.Account;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedBalanceEvent.java b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedBalanceEvent.java
index 84726e555d7..cb4ae78b610 100644
--- a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedBalanceEvent.java
+++ b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedBalanceEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.financialconnections.Account;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedBalanceEventNotification.java b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedBalanceEventNotification.java
index ae67bccd887..40f60bc448c 100644
--- a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedBalanceEventNotification.java
+++ b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedBalanceEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.financialconnections.Account;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedOwnershipEvent.java b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedOwnershipEvent.java
index 054b02f8d05..78d8d7c5ead 100644
--- a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedOwnershipEvent.java
+++ b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedOwnershipEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.financialconnections.Account;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedOwnershipEventNotification.java b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedOwnershipEventNotification.java
index faebb452cb4..95fd68ff2ed 100644
--- a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedOwnershipEventNotification.java
+++ b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedOwnershipEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.financialconnections.Account;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedTransactionsEvent.java b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedTransactionsEvent.java
index 6c2f7d1fad2..7c9e16543ed 100644
--- a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedTransactionsEvent.java
+++ b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedTransactionsEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.financialconnections.Account;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedTransactionsEventNotification.java b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedTransactionsEventNotification.java
index 42982f225a2..b64dc338ff6 100644
--- a/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedTransactionsEventNotification.java
+++ b/src/main/java/com/stripe/events/V1FinancialConnectionsAccountRefreshedTransactionsEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.financialconnections.Account;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IdentityVerificationSessionCanceledEvent.java b/src/main/java/com/stripe/events/V1IdentityVerificationSessionCanceledEvent.java
index 40e87abeec9..daf42d41492 100644
--- a/src/main/java/com/stripe/events/V1IdentityVerificationSessionCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V1IdentityVerificationSessionCanceledEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.identity.VerificationSession;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IdentityVerificationSessionCanceledEventNotification.java b/src/main/java/com/stripe/events/V1IdentityVerificationSessionCanceledEventNotification.java
index 5f847deaf4a..d507a5bba34 100644
--- a/src/main/java/com/stripe/events/V1IdentityVerificationSessionCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IdentityVerificationSessionCanceledEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.identity.VerificationSession;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IdentityVerificationSessionCreatedEvent.java b/src/main/java/com/stripe/events/V1IdentityVerificationSessionCreatedEvent.java
index 6d5c28a1189..884f23b693e 100644
--- a/src/main/java/com/stripe/events/V1IdentityVerificationSessionCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IdentityVerificationSessionCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.identity.VerificationSession;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IdentityVerificationSessionCreatedEventNotification.java b/src/main/java/com/stripe/events/V1IdentityVerificationSessionCreatedEventNotification.java
index 88886138a74..cf5ce15edf2 100644
--- a/src/main/java/com/stripe/events/V1IdentityVerificationSessionCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IdentityVerificationSessionCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.identity.VerificationSession;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IdentityVerificationSessionProcessingEvent.java b/src/main/java/com/stripe/events/V1IdentityVerificationSessionProcessingEvent.java
index b3f1f30af7e..6fdf5bbf42b 100644
--- a/src/main/java/com/stripe/events/V1IdentityVerificationSessionProcessingEvent.java
+++ b/src/main/java/com/stripe/events/V1IdentityVerificationSessionProcessingEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.identity.VerificationSession;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IdentityVerificationSessionProcessingEventNotification.java b/src/main/java/com/stripe/events/V1IdentityVerificationSessionProcessingEventNotification.java
index 8723ad60afa..1e2e7f2e8d3 100644
--- a/src/main/java/com/stripe/events/V1IdentityVerificationSessionProcessingEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IdentityVerificationSessionProcessingEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.identity.VerificationSession;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IdentityVerificationSessionRedactedEvent.java b/src/main/java/com/stripe/events/V1IdentityVerificationSessionRedactedEvent.java
index 71c7370f0fe..615a11de0b5 100644
--- a/src/main/java/com/stripe/events/V1IdentityVerificationSessionRedactedEvent.java
+++ b/src/main/java/com/stripe/events/V1IdentityVerificationSessionRedactedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.identity.VerificationSession;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IdentityVerificationSessionRedactedEventNotification.java b/src/main/java/com/stripe/events/V1IdentityVerificationSessionRedactedEventNotification.java
index a480b549506..bbc837175bd 100644
--- a/src/main/java/com/stripe/events/V1IdentityVerificationSessionRedactedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IdentityVerificationSessionRedactedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.identity.VerificationSession;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IdentityVerificationSessionRequiresInputEvent.java b/src/main/java/com/stripe/events/V1IdentityVerificationSessionRequiresInputEvent.java
index d34a268e234..546f2b88cc8 100644
--- a/src/main/java/com/stripe/events/V1IdentityVerificationSessionRequiresInputEvent.java
+++ b/src/main/java/com/stripe/events/V1IdentityVerificationSessionRequiresInputEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.identity.VerificationSession;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IdentityVerificationSessionRequiresInputEventNotification.java b/src/main/java/com/stripe/events/V1IdentityVerificationSessionRequiresInputEventNotification.java
index c137752acfe..ed348fbd0d6 100644
--- a/src/main/java/com/stripe/events/V1IdentityVerificationSessionRequiresInputEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IdentityVerificationSessionRequiresInputEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.identity.VerificationSession;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IdentityVerificationSessionVerifiedEvent.java b/src/main/java/com/stripe/events/V1IdentityVerificationSessionVerifiedEvent.java
index 4ce5b89ed3f..5cefde2ea80 100644
--- a/src/main/java/com/stripe/events/V1IdentityVerificationSessionVerifiedEvent.java
+++ b/src/main/java/com/stripe/events/V1IdentityVerificationSessionVerifiedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.identity.VerificationSession;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IdentityVerificationSessionVerifiedEventNotification.java b/src/main/java/com/stripe/events/V1IdentityVerificationSessionVerifiedEventNotification.java
index 5da0b743606..e19e2e33dc6 100644
--- a/src/main/java/com/stripe/events/V1IdentityVerificationSessionVerifiedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IdentityVerificationSessionVerifiedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.identity.VerificationSession;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceCreatedEvent.java b/src/main/java/com/stripe/events/V1InvoiceCreatedEvent.java
index fa6f533e0e8..1952deb8d1f 100644
--- a/src/main/java/com/stripe/events/V1InvoiceCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoiceCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceCreatedEventNotification.java b/src/main/java/com/stripe/events/V1InvoiceCreatedEventNotification.java
index 9b57a1b5f73..3954bf5c876 100644
--- a/src/main/java/com/stripe/events/V1InvoiceCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoiceCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceDeletedEvent.java b/src/main/java/com/stripe/events/V1InvoiceDeletedEvent.java
index 60ae59226a7..033d8487c57 100644
--- a/src/main/java/com/stripe/events/V1InvoiceDeletedEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoiceDeletedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceDeletedEventNotification.java b/src/main/java/com/stripe/events/V1InvoiceDeletedEventNotification.java
index 49894df7344..536ffcfb4f4 100644
--- a/src/main/java/com/stripe/events/V1InvoiceDeletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoiceDeletedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceFinalizationFailedEvent.java b/src/main/java/com/stripe/events/V1InvoiceFinalizationFailedEvent.java
index c503beb7ac3..e0a4235cb8f 100644
--- a/src/main/java/com/stripe/events/V1InvoiceFinalizationFailedEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoiceFinalizationFailedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceFinalizationFailedEventNotification.java b/src/main/java/com/stripe/events/V1InvoiceFinalizationFailedEventNotification.java
index db78adf9e8f..8744a0bb1c7 100644
--- a/src/main/java/com/stripe/events/V1InvoiceFinalizationFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoiceFinalizationFailedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceFinalizedEvent.java b/src/main/java/com/stripe/events/V1InvoiceFinalizedEvent.java
index 75090c0921d..ccdb13dd785 100644
--- a/src/main/java/com/stripe/events/V1InvoiceFinalizedEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoiceFinalizedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceFinalizedEventNotification.java b/src/main/java/com/stripe/events/V1InvoiceFinalizedEventNotification.java
index 03519fedad5..bb69738e53d 100644
--- a/src/main/java/com/stripe/events/V1InvoiceFinalizedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoiceFinalizedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceMarkedUncollectibleEvent.java b/src/main/java/com/stripe/events/V1InvoiceMarkedUncollectibleEvent.java
index 463a7c7675d..d2bf41f0a13 100644
--- a/src/main/java/com/stripe/events/V1InvoiceMarkedUncollectibleEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoiceMarkedUncollectibleEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceMarkedUncollectibleEventNotification.java b/src/main/java/com/stripe/events/V1InvoiceMarkedUncollectibleEventNotification.java
index 63c44e7600c..348350a0309 100644
--- a/src/main/java/com/stripe/events/V1InvoiceMarkedUncollectibleEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoiceMarkedUncollectibleEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceOverdueEvent.java b/src/main/java/com/stripe/events/V1InvoiceOverdueEvent.java
index 1e2d0abb8c3..eed159f3e22 100644
--- a/src/main/java/com/stripe/events/V1InvoiceOverdueEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoiceOverdueEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceOverdueEventNotification.java b/src/main/java/com/stripe/events/V1InvoiceOverdueEventNotification.java
index 2c680862425..3b481046dd1 100644
--- a/src/main/java/com/stripe/events/V1InvoiceOverdueEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoiceOverdueEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceOverpaidEvent.java b/src/main/java/com/stripe/events/V1InvoiceOverpaidEvent.java
index 8ae494b0ba8..f59ed146144 100644
--- a/src/main/java/com/stripe/events/V1InvoiceOverpaidEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoiceOverpaidEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceOverpaidEventNotification.java b/src/main/java/com/stripe/events/V1InvoiceOverpaidEventNotification.java
index 02b1d717897..cfe2c219e1b 100644
--- a/src/main/java/com/stripe/events/V1InvoiceOverpaidEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoiceOverpaidEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoicePaidEvent.java b/src/main/java/com/stripe/events/V1InvoicePaidEvent.java
index f4ca039ec5f..42dbe642092 100644
--- a/src/main/java/com/stripe/events/V1InvoicePaidEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoicePaidEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoicePaidEventNotification.java b/src/main/java/com/stripe/events/V1InvoicePaidEventNotification.java
index 55f91cfdd5b..ab421973405 100644
--- a/src/main/java/com/stripe/events/V1InvoicePaidEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoicePaidEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoicePaymentActionRequiredEvent.java b/src/main/java/com/stripe/events/V1InvoicePaymentActionRequiredEvent.java
index d7d9465d0ff..2095cb626df 100644
--- a/src/main/java/com/stripe/events/V1InvoicePaymentActionRequiredEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoicePaymentActionRequiredEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoicePaymentActionRequiredEventNotification.java b/src/main/java/com/stripe/events/V1InvoicePaymentActionRequiredEventNotification.java
index 7fe970a0698..0ca518d6c3f 100644
--- a/src/main/java/com/stripe/events/V1InvoicePaymentActionRequiredEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoicePaymentActionRequiredEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoicePaymentFailedEvent.java b/src/main/java/com/stripe/events/V1InvoicePaymentFailedEvent.java
index 6a012fe8d8e..1937cfccbdb 100644
--- a/src/main/java/com/stripe/events/V1InvoicePaymentFailedEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoicePaymentFailedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoicePaymentFailedEventNotification.java b/src/main/java/com/stripe/events/V1InvoicePaymentFailedEventNotification.java
index 595116e4227..9e0267a1874 100644
--- a/src/main/java/com/stripe/events/V1InvoicePaymentFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoicePaymentFailedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoicePaymentPaidEvent.java b/src/main/java/com/stripe/events/V1InvoicePaymentPaidEvent.java
index 28b741499a7..0967e93fac7 100644
--- a/src/main/java/com/stripe/events/V1InvoicePaymentPaidEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoicePaymentPaidEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.InvoicePayment;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoicePaymentPaidEventNotification.java b/src/main/java/com/stripe/events/V1InvoicePaymentPaidEventNotification.java
index d1153e1fbf9..2f1a66e86c1 100644
--- a/src/main/java/com/stripe/events/V1InvoicePaymentPaidEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoicePaymentPaidEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.InvoicePayment;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoicePaymentSucceededEvent.java b/src/main/java/com/stripe/events/V1InvoicePaymentSucceededEvent.java
index 6c1f00de148..12ab414f3c5 100644
--- a/src/main/java/com/stripe/events/V1InvoicePaymentSucceededEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoicePaymentSucceededEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoicePaymentSucceededEventNotification.java b/src/main/java/com/stripe/events/V1InvoicePaymentSucceededEventNotification.java
index 6e275ca58d3..e189800959c 100644
--- a/src/main/java/com/stripe/events/V1InvoicePaymentSucceededEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoicePaymentSucceededEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceSentEvent.java b/src/main/java/com/stripe/events/V1InvoiceSentEvent.java
index f2a4280b617..d649d665f59 100644
--- a/src/main/java/com/stripe/events/V1InvoiceSentEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoiceSentEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceSentEventNotification.java b/src/main/java/com/stripe/events/V1InvoiceSentEventNotification.java
index 659d21d432b..e77d5ec448e 100644
--- a/src/main/java/com/stripe/events/V1InvoiceSentEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoiceSentEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceUpcomingEvent.java b/src/main/java/com/stripe/events/V1InvoiceUpcomingEvent.java
index 21743a25661..7fb1d7a09fe 100644
--- a/src/main/java/com/stripe/events/V1InvoiceUpcomingEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoiceUpcomingEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceUpcomingEventNotification.java b/src/main/java/com/stripe/events/V1InvoiceUpcomingEventNotification.java
index 90e9ceb30ee..8e7edb4b504 100644
--- a/src/main/java/com/stripe/events/V1InvoiceUpcomingEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoiceUpcomingEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceUpdatedEvent.java b/src/main/java/com/stripe/events/V1InvoiceUpdatedEvent.java
index 599663e41e0..140569b5178 100644
--- a/src/main/java/com/stripe/events/V1InvoiceUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoiceUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1InvoiceUpdatedEventNotification.java
index 465242ce0a8..c59d9c1d83f 100644
--- a/src/main/java/com/stripe/events/V1InvoiceUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoiceUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceVoidedEvent.java b/src/main/java/com/stripe/events/V1InvoiceVoidedEvent.java
index 790c066b36d..c83bc7b8c90 100644
--- a/src/main/java/com/stripe/events/V1InvoiceVoidedEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoiceVoidedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceVoidedEventNotification.java b/src/main/java/com/stripe/events/V1InvoiceVoidedEventNotification.java
index 474bbf91eb3..dbfc9404086 100644
--- a/src/main/java/com/stripe/events/V1InvoiceVoidedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoiceVoidedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceWillBeDueEvent.java b/src/main/java/com/stripe/events/V1InvoiceWillBeDueEvent.java
index d4cb7d8b4f0..6496fa3d128 100644
--- a/src/main/java/com/stripe/events/V1InvoiceWillBeDueEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoiceWillBeDueEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceWillBeDueEventNotification.java b/src/main/java/com/stripe/events/V1InvoiceWillBeDueEventNotification.java
index df3b5d4e4e8..09479d7657f 100644
--- a/src/main/java/com/stripe/events/V1InvoiceWillBeDueEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoiceWillBeDueEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Invoice;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceitemCreatedEvent.java b/src/main/java/com/stripe/events/V1InvoiceitemCreatedEvent.java
index b49b27a9380..871e2a98a80 100644
--- a/src/main/java/com/stripe/events/V1InvoiceitemCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoiceitemCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.InvoiceItem;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceitemCreatedEventNotification.java b/src/main/java/com/stripe/events/V1InvoiceitemCreatedEventNotification.java
index 73e64c28d04..09a64cb5314 100644
--- a/src/main/java/com/stripe/events/V1InvoiceitemCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoiceitemCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.InvoiceItem;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceitemDeletedEvent.java b/src/main/java/com/stripe/events/V1InvoiceitemDeletedEvent.java
index 52478c9e0c4..87a4969624d 100644
--- a/src/main/java/com/stripe/events/V1InvoiceitemDeletedEvent.java
+++ b/src/main/java/com/stripe/events/V1InvoiceitemDeletedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.InvoiceItem;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1InvoiceitemDeletedEventNotification.java b/src/main/java/com/stripe/events/V1InvoiceitemDeletedEventNotification.java
index 3d31106ec6e..9061a2c317c 100644
--- a/src/main/java/com/stripe/events/V1InvoiceitemDeletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1InvoiceitemDeletedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.InvoiceItem;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingAuthorizationCreatedEvent.java b/src/main/java/com/stripe/events/V1IssuingAuthorizationCreatedEvent.java
index c08b5104a29..0e05852ac80 100644
--- a/src/main/java/com/stripe/events/V1IssuingAuthorizationCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingAuthorizationCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Authorization;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingAuthorizationCreatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingAuthorizationCreatedEventNotification.java
index a444f2098ae..48271405e93 100644
--- a/src/main/java/com/stripe/events/V1IssuingAuthorizationCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingAuthorizationCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Authorization;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingAuthorizationRequestEvent.java b/src/main/java/com/stripe/events/V1IssuingAuthorizationRequestEvent.java
index 58c36b87c29..88788c30c2f 100644
--- a/src/main/java/com/stripe/events/V1IssuingAuthorizationRequestEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingAuthorizationRequestEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Authorization;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingAuthorizationRequestEventNotification.java b/src/main/java/com/stripe/events/V1IssuingAuthorizationRequestEventNotification.java
index 13e503c663e..fb0beab0ef6 100644
--- a/src/main/java/com/stripe/events/V1IssuingAuthorizationRequestEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingAuthorizationRequestEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Authorization;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingAuthorizationUpdatedEvent.java b/src/main/java/com/stripe/events/V1IssuingAuthorizationUpdatedEvent.java
index 28a89fb174b..3090bf51460 100644
--- a/src/main/java/com/stripe/events/V1IssuingAuthorizationUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingAuthorizationUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Authorization;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingAuthorizationUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingAuthorizationUpdatedEventNotification.java
index 26132f7a56a..05bf9cda62b 100644
--- a/src/main/java/com/stripe/events/V1IssuingAuthorizationUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingAuthorizationUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Authorization;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingCardCreatedEvent.java b/src/main/java/com/stripe/events/V1IssuingCardCreatedEvent.java
index 82a5712355d..49b9bbbb05e 100644
--- a/src/main/java/com/stripe/events/V1IssuingCardCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingCardCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Card;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingCardCreatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingCardCreatedEventNotification.java
index 3c5b093cf84..30334aa665d 100644
--- a/src/main/java/com/stripe/events/V1IssuingCardCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingCardCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Card;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingCardUpdatedEvent.java b/src/main/java/com/stripe/events/V1IssuingCardUpdatedEvent.java
index ccb7f992f0a..fb34e5515d8 100644
--- a/src/main/java/com/stripe/events/V1IssuingCardUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingCardUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Card;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingCardUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingCardUpdatedEventNotification.java
index ac6624856e9..7d3e829f049 100644
--- a/src/main/java/com/stripe/events/V1IssuingCardUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingCardUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Card;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingCardholderCreatedEvent.java b/src/main/java/com/stripe/events/V1IssuingCardholderCreatedEvent.java
index 5278cc16125..e92014c20bb 100644
--- a/src/main/java/com/stripe/events/V1IssuingCardholderCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingCardholderCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Cardholder;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingCardholderCreatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingCardholderCreatedEventNotification.java
index f1fa9b93787..89b0c5a1789 100644
--- a/src/main/java/com/stripe/events/V1IssuingCardholderCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingCardholderCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Cardholder;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingCardholderUpdatedEvent.java b/src/main/java/com/stripe/events/V1IssuingCardholderUpdatedEvent.java
index 5ed2ed70840..af2e9a65aef 100644
--- a/src/main/java/com/stripe/events/V1IssuingCardholderUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingCardholderUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Cardholder;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingCardholderUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingCardholderUpdatedEventNotification.java
index e8c816d60e3..59413a8a342 100644
--- a/src/main/java/com/stripe/events/V1IssuingCardholderUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingCardholderUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Cardholder;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingDisputeClosedEvent.java b/src/main/java/com/stripe/events/V1IssuingDisputeClosedEvent.java
index 8b6d3b196d6..2e80bcea5b0 100644
--- a/src/main/java/com/stripe/events/V1IssuingDisputeClosedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingDisputeClosedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Dispute;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingDisputeClosedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingDisputeClosedEventNotification.java
index 57e76e6a3ff..546a7dafb19 100644
--- a/src/main/java/com/stripe/events/V1IssuingDisputeClosedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingDisputeClosedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Dispute;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingDisputeCreatedEvent.java b/src/main/java/com/stripe/events/V1IssuingDisputeCreatedEvent.java
index 698fe84233e..7c6586de1ee 100644
--- a/src/main/java/com/stripe/events/V1IssuingDisputeCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingDisputeCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Dispute;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingDisputeCreatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingDisputeCreatedEventNotification.java
index ee0d3e420c0..8f33edd8d96 100644
--- a/src/main/java/com/stripe/events/V1IssuingDisputeCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingDisputeCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Dispute;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingDisputeFundsReinstatedEvent.java b/src/main/java/com/stripe/events/V1IssuingDisputeFundsReinstatedEvent.java
index 4b0fc322e0b..5bf44f5e671 100644
--- a/src/main/java/com/stripe/events/V1IssuingDisputeFundsReinstatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingDisputeFundsReinstatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Dispute;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingDisputeFundsReinstatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingDisputeFundsReinstatedEventNotification.java
index 8a113be5a2f..527f14ab617 100644
--- a/src/main/java/com/stripe/events/V1IssuingDisputeFundsReinstatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingDisputeFundsReinstatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Dispute;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingDisputeFundsRescindedEvent.java b/src/main/java/com/stripe/events/V1IssuingDisputeFundsRescindedEvent.java
index 97e4e4c5413..13112c892ab 100644
--- a/src/main/java/com/stripe/events/V1IssuingDisputeFundsRescindedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingDisputeFundsRescindedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Dispute;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingDisputeFundsRescindedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingDisputeFundsRescindedEventNotification.java
index 2c5a60e2587..25d0b1fa3ca 100644
--- a/src/main/java/com/stripe/events/V1IssuingDisputeFundsRescindedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingDisputeFundsRescindedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Dispute;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingDisputeSubmittedEvent.java b/src/main/java/com/stripe/events/V1IssuingDisputeSubmittedEvent.java
index 62d2b8a2fe1..fb234946cd3 100644
--- a/src/main/java/com/stripe/events/V1IssuingDisputeSubmittedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingDisputeSubmittedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Dispute;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingDisputeSubmittedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingDisputeSubmittedEventNotification.java
index 1c829dfbc87..3ce7b87902d 100644
--- a/src/main/java/com/stripe/events/V1IssuingDisputeSubmittedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingDisputeSubmittedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Dispute;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingDisputeUpdatedEvent.java b/src/main/java/com/stripe/events/V1IssuingDisputeUpdatedEvent.java
index 7eb2bc12d52..23c218ec806 100644
--- a/src/main/java/com/stripe/events/V1IssuingDisputeUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingDisputeUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Dispute;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingDisputeUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingDisputeUpdatedEventNotification.java
index 76dea6d92bc..ccbbed2e922 100644
--- a/src/main/java/com/stripe/events/V1IssuingDisputeUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingDisputeUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Dispute;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignActivatedEvent.java b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignActivatedEvent.java
index 22f612c21a7..8b2530b460e 100644
--- a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignActivatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignActivatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.PersonalizationDesign;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignActivatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignActivatedEventNotification.java
index b084c52bd5e..1612e9fd213 100644
--- a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignActivatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignActivatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.PersonalizationDesign;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignDeactivatedEvent.java b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignDeactivatedEvent.java
index 9ead95502c5..72a5dcee49a 100644
--- a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignDeactivatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignDeactivatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.PersonalizationDesign;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignDeactivatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignDeactivatedEventNotification.java
index 6b80c422e24..f154a7a4571 100644
--- a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignDeactivatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignDeactivatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.PersonalizationDesign;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignRejectedEvent.java b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignRejectedEvent.java
index 144ff6342d2..81ad30b5d23 100644
--- a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignRejectedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignRejectedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.PersonalizationDesign;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignRejectedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignRejectedEventNotification.java
index 61b21893aa5..4b650d027cd 100644
--- a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignRejectedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignRejectedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.PersonalizationDesign;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignUpdatedEvent.java b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignUpdatedEvent.java
index a10bab02ec4..b6ea273836b 100644
--- a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.PersonalizationDesign;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignUpdatedEventNotification.java
index 025cfd2ba05..f8550609c1b 100644
--- a/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingPersonalizationDesignUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.PersonalizationDesign;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingTokenCreatedEvent.java b/src/main/java/com/stripe/events/V1IssuingTokenCreatedEvent.java
index 33b885a1ded..0d199ec201f 100644
--- a/src/main/java/com/stripe/events/V1IssuingTokenCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingTokenCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Token;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingTokenCreatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingTokenCreatedEventNotification.java
index e85df8381bf..3a55eefe1c2 100644
--- a/src/main/java/com/stripe/events/V1IssuingTokenCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingTokenCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Token;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingTokenUpdatedEvent.java b/src/main/java/com/stripe/events/V1IssuingTokenUpdatedEvent.java
index ba12d72abaa..6d5abfea0e2 100644
--- a/src/main/java/com/stripe/events/V1IssuingTokenUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingTokenUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Token;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingTokenUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingTokenUpdatedEventNotification.java
index b3dd2899492..bf5a5e53cf8 100644
--- a/src/main/java/com/stripe/events/V1IssuingTokenUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingTokenUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Token;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingTransactionCreatedEvent.java b/src/main/java/com/stripe/events/V1IssuingTransactionCreatedEvent.java
index aa63751186e..c077bfff722 100644
--- a/src/main/java/com/stripe/events/V1IssuingTransactionCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingTransactionCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Transaction;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingTransactionCreatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingTransactionCreatedEventNotification.java
index 826e1b90761..885cc755930 100644
--- a/src/main/java/com/stripe/events/V1IssuingTransactionCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingTransactionCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Transaction;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingTransactionPurchaseDetailsReceiptUpdatedEvent.java b/src/main/java/com/stripe/events/V1IssuingTransactionPurchaseDetailsReceiptUpdatedEvent.java
index 245d91bbf7a..2e47539179f 100644
--- a/src/main/java/com/stripe/events/V1IssuingTransactionPurchaseDetailsReceiptUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingTransactionPurchaseDetailsReceiptUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Transaction;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingTransactionPurchaseDetailsReceiptUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingTransactionPurchaseDetailsReceiptUpdatedEventNotification.java
index 29adbc611e2..e7a2f5d996d 100644
--- a/src/main/java/com/stripe/events/V1IssuingTransactionPurchaseDetailsReceiptUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingTransactionPurchaseDetailsReceiptUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Transaction;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingTransactionUpdatedEvent.java b/src/main/java/com/stripe/events/V1IssuingTransactionUpdatedEvent.java
index 6668a8649a1..19b73ae5fa2 100644
--- a/src/main/java/com/stripe/events/V1IssuingTransactionUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1IssuingTransactionUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Transaction;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1IssuingTransactionUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1IssuingTransactionUpdatedEventNotification.java
index b32eb601476..0d9bbfce9b1 100644
--- a/src/main/java/com/stripe/events/V1IssuingTransactionUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1IssuingTransactionUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.issuing.Transaction;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1MandateUpdatedEvent.java b/src/main/java/com/stripe/events/V1MandateUpdatedEvent.java
index b8f2bb972ef..a4ba0955f21 100644
--- a/src/main/java/com/stripe/events/V1MandateUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1MandateUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Mandate;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1MandateUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1MandateUpdatedEventNotification.java
index 336f33815f0..327615f6b82 100644
--- a/src/main/java/com/stripe/events/V1MandateUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1MandateUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Mandate;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentAmountCapturableUpdatedEvent.java b/src/main/java/com/stripe/events/V1PaymentIntentAmountCapturableUpdatedEvent.java
index 459a5138183..125635d82d2 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentAmountCapturableUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentAmountCapturableUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentAmountCapturableUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1PaymentIntentAmountCapturableUpdatedEventNotification.java
index 1ac1dbe7bd7..c48ab863630 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentAmountCapturableUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentAmountCapturableUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentCanceledEvent.java b/src/main/java/com/stripe/events/V1PaymentIntentCanceledEvent.java
index 97d537d1c54..3128c0c60ba 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentCanceledEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentCanceledEventNotification.java b/src/main/java/com/stripe/events/V1PaymentIntentCanceledEventNotification.java
index cec3235c1ce..ae061b63cb1 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentCanceledEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentCreatedEvent.java b/src/main/java/com/stripe/events/V1PaymentIntentCreatedEvent.java
index 6cc59a2d0d9..1f183164088 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentCreatedEventNotification.java b/src/main/java/com/stripe/events/V1PaymentIntentCreatedEventNotification.java
index 4d906270466..e2b50048bcc 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentPartiallyFundedEvent.java b/src/main/java/com/stripe/events/V1PaymentIntentPartiallyFundedEvent.java
index 6c0129f4547..c1ba0d4a8c1 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentPartiallyFundedEvent.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentPartiallyFundedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentPartiallyFundedEventNotification.java b/src/main/java/com/stripe/events/V1PaymentIntentPartiallyFundedEventNotification.java
index 9d8fb920b5c..c819f47b84f 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentPartiallyFundedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentPartiallyFundedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentPaymentFailedEvent.java b/src/main/java/com/stripe/events/V1PaymentIntentPaymentFailedEvent.java
index fba40f2dc3c..544b74fee5a 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentPaymentFailedEvent.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentPaymentFailedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentPaymentFailedEventNotification.java b/src/main/java/com/stripe/events/V1PaymentIntentPaymentFailedEventNotification.java
index fe859913609..43bdd843dd8 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentPaymentFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentPaymentFailedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentProcessingEvent.java b/src/main/java/com/stripe/events/V1PaymentIntentProcessingEvent.java
index a57b7fe5c86..eab8c151bdd 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentProcessingEvent.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentProcessingEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentProcessingEventNotification.java b/src/main/java/com/stripe/events/V1PaymentIntentProcessingEventNotification.java
index d0ae37d312a..8eeb2ab0315 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentProcessingEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentProcessingEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentRequiresActionEvent.java b/src/main/java/com/stripe/events/V1PaymentIntentRequiresActionEvent.java
index 0f374e821ac..231e633a973 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentRequiresActionEvent.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentRequiresActionEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentRequiresActionEventNotification.java b/src/main/java/com/stripe/events/V1PaymentIntentRequiresActionEventNotification.java
index 60dd3abef5d..eb918498eae 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentRequiresActionEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentRequiresActionEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentSucceededEvent.java b/src/main/java/com/stripe/events/V1PaymentIntentSucceededEvent.java
index 6dda1d8ba60..acedb9f6990 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentSucceededEvent.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentSucceededEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentIntentSucceededEventNotification.java b/src/main/java/com/stripe/events/V1PaymentIntentSucceededEventNotification.java
index 6444d478adf..76bcccee443 100644
--- a/src/main/java/com/stripe/events/V1PaymentIntentSucceededEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PaymentIntentSucceededEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentIntent;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentLinkCreatedEvent.java b/src/main/java/com/stripe/events/V1PaymentLinkCreatedEvent.java
index fccf42883a1..03ee30b4db2 100644
--- a/src/main/java/com/stripe/events/V1PaymentLinkCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PaymentLinkCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentLink;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentLinkCreatedEventNotification.java b/src/main/java/com/stripe/events/V1PaymentLinkCreatedEventNotification.java
index 86c4a3975a8..1bd86d1ee59 100644
--- a/src/main/java/com/stripe/events/V1PaymentLinkCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PaymentLinkCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentLink;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentLinkUpdatedEvent.java b/src/main/java/com/stripe/events/V1PaymentLinkUpdatedEvent.java
index 5d70871cd07..936fbb564b5 100644
--- a/src/main/java/com/stripe/events/V1PaymentLinkUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PaymentLinkUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentLink;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentLinkUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1PaymentLinkUpdatedEventNotification.java
index 2c759cd1101..27b2b07d7af 100644
--- a/src/main/java/com/stripe/events/V1PaymentLinkUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PaymentLinkUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentLink;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentMethodAttachedEvent.java b/src/main/java/com/stripe/events/V1PaymentMethodAttachedEvent.java
index 93f12cf59ee..966af690d45 100644
--- a/src/main/java/com/stripe/events/V1PaymentMethodAttachedEvent.java
+++ b/src/main/java/com/stripe/events/V1PaymentMethodAttachedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentMethod;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentMethodAttachedEventNotification.java b/src/main/java/com/stripe/events/V1PaymentMethodAttachedEventNotification.java
index 30e88264145..9ddd83c1293 100644
--- a/src/main/java/com/stripe/events/V1PaymentMethodAttachedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PaymentMethodAttachedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentMethod;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentMethodAutomaticallyUpdatedEvent.java b/src/main/java/com/stripe/events/V1PaymentMethodAutomaticallyUpdatedEvent.java
index 3bc0dea6024..024919bccfb 100644
--- a/src/main/java/com/stripe/events/V1PaymentMethodAutomaticallyUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PaymentMethodAutomaticallyUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentMethod;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentMethodAutomaticallyUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1PaymentMethodAutomaticallyUpdatedEventNotification.java
index b19c0f56d1b..558bf1fb067 100644
--- a/src/main/java/com/stripe/events/V1PaymentMethodAutomaticallyUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PaymentMethodAutomaticallyUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentMethod;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentMethodDetachedEvent.java b/src/main/java/com/stripe/events/V1PaymentMethodDetachedEvent.java
index 71fcb03b214..f33dafe3ea7 100644
--- a/src/main/java/com/stripe/events/V1PaymentMethodDetachedEvent.java
+++ b/src/main/java/com/stripe/events/V1PaymentMethodDetachedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentMethod;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentMethodDetachedEventNotification.java b/src/main/java/com/stripe/events/V1PaymentMethodDetachedEventNotification.java
index 200e651fd6f..af92fdd441d 100644
--- a/src/main/java/com/stripe/events/V1PaymentMethodDetachedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PaymentMethodDetachedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentMethod;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentMethodUpdatedEvent.java b/src/main/java/com/stripe/events/V1PaymentMethodUpdatedEvent.java
index 01e1e35a0b8..fef67d012b7 100644
--- a/src/main/java/com/stripe/events/V1PaymentMethodUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PaymentMethodUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentMethod;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PaymentMethodUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1PaymentMethodUpdatedEventNotification.java
index 0147cb29242..2b2a01d5f5a 100644
--- a/src/main/java/com/stripe/events/V1PaymentMethodUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PaymentMethodUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PaymentMethod;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PayoutCanceledEvent.java b/src/main/java/com/stripe/events/V1PayoutCanceledEvent.java
index dda78c6ad80..9880241c8a0 100644
--- a/src/main/java/com/stripe/events/V1PayoutCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V1PayoutCanceledEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Payout;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PayoutCanceledEventNotification.java b/src/main/java/com/stripe/events/V1PayoutCanceledEventNotification.java
index 067c9bd236e..a38ea7b2e34 100644
--- a/src/main/java/com/stripe/events/V1PayoutCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PayoutCanceledEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Payout;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PayoutCreatedEvent.java b/src/main/java/com/stripe/events/V1PayoutCreatedEvent.java
index 66623fb854d..80c114679f7 100644
--- a/src/main/java/com/stripe/events/V1PayoutCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PayoutCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Payout;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PayoutCreatedEventNotification.java b/src/main/java/com/stripe/events/V1PayoutCreatedEventNotification.java
index 9fd606e9baa..bcbabe2888d 100644
--- a/src/main/java/com/stripe/events/V1PayoutCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PayoutCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Payout;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PayoutFailedEvent.java b/src/main/java/com/stripe/events/V1PayoutFailedEvent.java
index 56c9a1af895..707174f1813 100644
--- a/src/main/java/com/stripe/events/V1PayoutFailedEvent.java
+++ b/src/main/java/com/stripe/events/V1PayoutFailedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Payout;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PayoutFailedEventNotification.java b/src/main/java/com/stripe/events/V1PayoutFailedEventNotification.java
index 4bb27ede376..b070ac3b663 100644
--- a/src/main/java/com/stripe/events/V1PayoutFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PayoutFailedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Payout;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PayoutPaidEvent.java b/src/main/java/com/stripe/events/V1PayoutPaidEvent.java
index 8e5d83634ef..1d74dc45b70 100644
--- a/src/main/java/com/stripe/events/V1PayoutPaidEvent.java
+++ b/src/main/java/com/stripe/events/V1PayoutPaidEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Payout;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PayoutPaidEventNotification.java b/src/main/java/com/stripe/events/V1PayoutPaidEventNotification.java
index 262b6b4c759..6e0fda51352 100644
--- a/src/main/java/com/stripe/events/V1PayoutPaidEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PayoutPaidEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Payout;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PayoutReconciliationCompletedEvent.java b/src/main/java/com/stripe/events/V1PayoutReconciliationCompletedEvent.java
index 9ee2d564312..95a426963a0 100644
--- a/src/main/java/com/stripe/events/V1PayoutReconciliationCompletedEvent.java
+++ b/src/main/java/com/stripe/events/V1PayoutReconciliationCompletedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Payout;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PayoutReconciliationCompletedEventNotification.java b/src/main/java/com/stripe/events/V1PayoutReconciliationCompletedEventNotification.java
index b23bf68c0f2..d38dbf430b7 100644
--- a/src/main/java/com/stripe/events/V1PayoutReconciliationCompletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PayoutReconciliationCompletedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Payout;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PayoutUpdatedEvent.java b/src/main/java/com/stripe/events/V1PayoutUpdatedEvent.java
index 7a11e04e88c..432c1639930 100644
--- a/src/main/java/com/stripe/events/V1PayoutUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PayoutUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Payout;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PayoutUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1PayoutUpdatedEventNotification.java
index 9cf6e6f40d4..34124d511a2 100644
--- a/src/main/java/com/stripe/events/V1PayoutUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PayoutUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Payout;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PersonCreatedEvent.java b/src/main/java/com/stripe/events/V1PersonCreatedEvent.java
index 8da3b3533bd..6f78717eb13 100644
--- a/src/main/java/com/stripe/events/V1PersonCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PersonCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Person;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PersonCreatedEventNotification.java b/src/main/java/com/stripe/events/V1PersonCreatedEventNotification.java
index 7b36c06e7a7..40a7e48acb8 100644
--- a/src/main/java/com/stripe/events/V1PersonCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PersonCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Person;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PersonDeletedEvent.java b/src/main/java/com/stripe/events/V1PersonDeletedEvent.java
index d3015d648f2..5396368b76c 100644
--- a/src/main/java/com/stripe/events/V1PersonDeletedEvent.java
+++ b/src/main/java/com/stripe/events/V1PersonDeletedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Person;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PersonDeletedEventNotification.java b/src/main/java/com/stripe/events/V1PersonDeletedEventNotification.java
index 0a90a7f4dca..a754f099536 100644
--- a/src/main/java/com/stripe/events/V1PersonDeletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PersonDeletedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Person;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PersonUpdatedEvent.java b/src/main/java/com/stripe/events/V1PersonUpdatedEvent.java
index 14838d5bf68..06823f59274 100644
--- a/src/main/java/com/stripe/events/V1PersonUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PersonUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Person;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PersonUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1PersonUpdatedEventNotification.java
index 02c8c2f9992..529e46ede26 100644
--- a/src/main/java/com/stripe/events/V1PersonUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PersonUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Person;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PlanCreatedEvent.java b/src/main/java/com/stripe/events/V1PlanCreatedEvent.java
index a8b4f185628..5cf7622e03a 100644
--- a/src/main/java/com/stripe/events/V1PlanCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PlanCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Plan;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PlanCreatedEventNotification.java b/src/main/java/com/stripe/events/V1PlanCreatedEventNotification.java
index be1110d1098..2275392a1d6 100644
--- a/src/main/java/com/stripe/events/V1PlanCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PlanCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Plan;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PlanDeletedEvent.java b/src/main/java/com/stripe/events/V1PlanDeletedEvent.java
index f304edac95c..e5caf8b5c2d 100644
--- a/src/main/java/com/stripe/events/V1PlanDeletedEvent.java
+++ b/src/main/java/com/stripe/events/V1PlanDeletedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Plan;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PlanDeletedEventNotification.java b/src/main/java/com/stripe/events/V1PlanDeletedEventNotification.java
index bb2140539fe..00da902d399 100644
--- a/src/main/java/com/stripe/events/V1PlanDeletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PlanDeletedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Plan;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PlanUpdatedEvent.java b/src/main/java/com/stripe/events/V1PlanUpdatedEvent.java
index 2dfcdfea60b..8327f97db13 100644
--- a/src/main/java/com/stripe/events/V1PlanUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PlanUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Plan;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PlanUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1PlanUpdatedEventNotification.java
index 2230d53c4df..f51016f9508 100644
--- a/src/main/java/com/stripe/events/V1PlanUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PlanUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Plan;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PriceCreatedEvent.java b/src/main/java/com/stripe/events/V1PriceCreatedEvent.java
index a65ce7b61b9..97bbfb31cc0 100644
--- a/src/main/java/com/stripe/events/V1PriceCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PriceCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Price;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PriceCreatedEventNotification.java b/src/main/java/com/stripe/events/V1PriceCreatedEventNotification.java
index 4a1d3d533fa..51ea14332aa 100644
--- a/src/main/java/com/stripe/events/V1PriceCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PriceCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Price;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PriceDeletedEvent.java b/src/main/java/com/stripe/events/V1PriceDeletedEvent.java
index 9124cc29963..c31b3478f7e 100644
--- a/src/main/java/com/stripe/events/V1PriceDeletedEvent.java
+++ b/src/main/java/com/stripe/events/V1PriceDeletedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Price;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PriceDeletedEventNotification.java b/src/main/java/com/stripe/events/V1PriceDeletedEventNotification.java
index 12120d58ce8..0ecdb9f4537 100644
--- a/src/main/java/com/stripe/events/V1PriceDeletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PriceDeletedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Price;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PriceUpdatedEvent.java b/src/main/java/com/stripe/events/V1PriceUpdatedEvent.java
index 6a66c18d4d1..ff5418310cf 100644
--- a/src/main/java/com/stripe/events/V1PriceUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PriceUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Price;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PriceUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1PriceUpdatedEventNotification.java
index 902c3c0a97e..fecac238782 100644
--- a/src/main/java/com/stripe/events/V1PriceUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PriceUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Price;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ProductCreatedEvent.java b/src/main/java/com/stripe/events/V1ProductCreatedEvent.java
index 5fcaebf015f..b897a569ebd 100644
--- a/src/main/java/com/stripe/events/V1ProductCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1ProductCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Product;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ProductCreatedEventNotification.java b/src/main/java/com/stripe/events/V1ProductCreatedEventNotification.java
index 15b19c42e68..afc202f2f8a 100644
--- a/src/main/java/com/stripe/events/V1ProductCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ProductCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Product;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ProductDeletedEvent.java b/src/main/java/com/stripe/events/V1ProductDeletedEvent.java
index 4bd62226e1c..5c8c9ac2945 100644
--- a/src/main/java/com/stripe/events/V1ProductDeletedEvent.java
+++ b/src/main/java/com/stripe/events/V1ProductDeletedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Product;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ProductDeletedEventNotification.java b/src/main/java/com/stripe/events/V1ProductDeletedEventNotification.java
index 212a577a8f9..a74f6bf561f 100644
--- a/src/main/java/com/stripe/events/V1ProductDeletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ProductDeletedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Product;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ProductUpdatedEvent.java b/src/main/java/com/stripe/events/V1ProductUpdatedEvent.java
index 47f4176569f..d17c9bff2eb 100644
--- a/src/main/java/com/stripe/events/V1ProductUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1ProductUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Product;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ProductUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1ProductUpdatedEventNotification.java
index c6a61ce6531..9028939661d 100644
--- a/src/main/java/com/stripe/events/V1ProductUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ProductUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Product;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PromotionCodeCreatedEvent.java b/src/main/java/com/stripe/events/V1PromotionCodeCreatedEvent.java
index 99b8c9862d8..d3c26846554 100644
--- a/src/main/java/com/stripe/events/V1PromotionCodeCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PromotionCodeCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PromotionCode;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PromotionCodeCreatedEventNotification.java b/src/main/java/com/stripe/events/V1PromotionCodeCreatedEventNotification.java
index 5219b33907d..6ed63cf5198 100644
--- a/src/main/java/com/stripe/events/V1PromotionCodeCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PromotionCodeCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PromotionCode;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PromotionCodeUpdatedEvent.java b/src/main/java/com/stripe/events/V1PromotionCodeUpdatedEvent.java
index f77547185ef..dd7b8a7f022 100644
--- a/src/main/java/com/stripe/events/V1PromotionCodeUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1PromotionCodeUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PromotionCode;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1PromotionCodeUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1PromotionCodeUpdatedEventNotification.java
index 6f8aa910065..89ad698d464 100644
--- a/src/main/java/com/stripe/events/V1PromotionCodeUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1PromotionCodeUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.PromotionCode;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1QuoteAcceptedEvent.java b/src/main/java/com/stripe/events/V1QuoteAcceptedEvent.java
index 2a520b995f6..a717a5bdfc4 100644
--- a/src/main/java/com/stripe/events/V1QuoteAcceptedEvent.java
+++ b/src/main/java/com/stripe/events/V1QuoteAcceptedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Quote;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1QuoteAcceptedEventNotification.java b/src/main/java/com/stripe/events/V1QuoteAcceptedEventNotification.java
index 33f8a57d5fa..cc39ea862c5 100644
--- a/src/main/java/com/stripe/events/V1QuoteAcceptedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1QuoteAcceptedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Quote;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1QuoteCanceledEvent.java b/src/main/java/com/stripe/events/V1QuoteCanceledEvent.java
index b9c50d7d77b..7d7b85991fc 100644
--- a/src/main/java/com/stripe/events/V1QuoteCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V1QuoteCanceledEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Quote;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1QuoteCanceledEventNotification.java b/src/main/java/com/stripe/events/V1QuoteCanceledEventNotification.java
index 72509c52ef7..a74a3413153 100644
--- a/src/main/java/com/stripe/events/V1QuoteCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V1QuoteCanceledEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Quote;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1QuoteCreatedEvent.java b/src/main/java/com/stripe/events/V1QuoteCreatedEvent.java
index afb483965b7..d0eb99be401 100644
--- a/src/main/java/com/stripe/events/V1QuoteCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1QuoteCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Quote;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1QuoteCreatedEventNotification.java b/src/main/java/com/stripe/events/V1QuoteCreatedEventNotification.java
index f21f903e338..9f4e397bb9f 100644
--- a/src/main/java/com/stripe/events/V1QuoteCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1QuoteCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Quote;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1QuoteFinalizedEvent.java b/src/main/java/com/stripe/events/V1QuoteFinalizedEvent.java
index c10f20ea890..16b9e221c9e 100644
--- a/src/main/java/com/stripe/events/V1QuoteFinalizedEvent.java
+++ b/src/main/java/com/stripe/events/V1QuoteFinalizedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Quote;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1QuoteFinalizedEventNotification.java b/src/main/java/com/stripe/events/V1QuoteFinalizedEventNotification.java
index 1ed6b679180..45a937db593 100644
--- a/src/main/java/com/stripe/events/V1QuoteFinalizedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1QuoteFinalizedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Quote;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningCreatedEvent.java b/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningCreatedEvent.java
index 46affb4dd8a..34655420cb3 100644
--- a/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.radar.EarlyFraudWarning;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningCreatedEventNotification.java b/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningCreatedEventNotification.java
index e8f2455e09e..bf8897355ac 100644
--- a/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.radar.EarlyFraudWarning;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningUpdatedEvent.java b/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningUpdatedEvent.java
index f35181b511a..b6ce0785788 100644
--- a/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.radar.EarlyFraudWarning;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningUpdatedEventNotification.java
index bb10722b973..a6b0751a535 100644
--- a/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1RadarEarlyFraudWarningUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.radar.EarlyFraudWarning;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1RefundCreatedEvent.java b/src/main/java/com/stripe/events/V1RefundCreatedEvent.java
index 057c2a8da80..0b1feede61f 100644
--- a/src/main/java/com/stripe/events/V1RefundCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1RefundCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Refund;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1RefundCreatedEventNotification.java b/src/main/java/com/stripe/events/V1RefundCreatedEventNotification.java
index e45767dc9a2..998cb15407f 100644
--- a/src/main/java/com/stripe/events/V1RefundCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1RefundCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Refund;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1RefundFailedEvent.java b/src/main/java/com/stripe/events/V1RefundFailedEvent.java
index 0c1c6649298..8f2e49fd82c 100644
--- a/src/main/java/com/stripe/events/V1RefundFailedEvent.java
+++ b/src/main/java/com/stripe/events/V1RefundFailedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Refund;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1RefundFailedEventNotification.java b/src/main/java/com/stripe/events/V1RefundFailedEventNotification.java
index 86e537723fe..4de1f8e6620 100644
--- a/src/main/java/com/stripe/events/V1RefundFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1RefundFailedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Refund;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1RefundUpdatedEvent.java b/src/main/java/com/stripe/events/V1RefundUpdatedEvent.java
index 10408d37294..039754b13e5 100644
--- a/src/main/java/com/stripe/events/V1RefundUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1RefundUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Refund;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1RefundUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1RefundUpdatedEventNotification.java
index e50e50d1645..79c74de6baa 100644
--- a/src/main/java/com/stripe/events/V1RefundUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1RefundUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Refund;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ReviewClosedEvent.java b/src/main/java/com/stripe/events/V1ReviewClosedEvent.java
index 3cc28c00666..03c35b5d6c7 100644
--- a/src/main/java/com/stripe/events/V1ReviewClosedEvent.java
+++ b/src/main/java/com/stripe/events/V1ReviewClosedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Review;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ReviewClosedEventNotification.java b/src/main/java/com/stripe/events/V1ReviewClosedEventNotification.java
index 0e5d3c84139..b91dc71d8b1 100644
--- a/src/main/java/com/stripe/events/V1ReviewClosedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ReviewClosedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Review;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ReviewOpenedEvent.java b/src/main/java/com/stripe/events/V1ReviewOpenedEvent.java
index 96d72672bfd..9ecb0820b41 100644
--- a/src/main/java/com/stripe/events/V1ReviewOpenedEvent.java
+++ b/src/main/java/com/stripe/events/V1ReviewOpenedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Review;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1ReviewOpenedEventNotification.java b/src/main/java/com/stripe/events/V1ReviewOpenedEventNotification.java
index 3eb16c48b67..f43b6b6c46c 100644
--- a/src/main/java/com/stripe/events/V1ReviewOpenedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1ReviewOpenedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Review;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SetupIntentCanceledEvent.java b/src/main/java/com/stripe/events/V1SetupIntentCanceledEvent.java
index e36d8899884..9d1a9a4da8f 100644
--- a/src/main/java/com/stripe/events/V1SetupIntentCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V1SetupIntentCanceledEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SetupIntent;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SetupIntentCanceledEventNotification.java b/src/main/java/com/stripe/events/V1SetupIntentCanceledEventNotification.java
index a517cf6fe94..a4731ef1d78 100644
--- a/src/main/java/com/stripe/events/V1SetupIntentCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SetupIntentCanceledEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SetupIntent;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SetupIntentCreatedEvent.java b/src/main/java/com/stripe/events/V1SetupIntentCreatedEvent.java
index 000a18b16d2..729b1f27a19 100644
--- a/src/main/java/com/stripe/events/V1SetupIntentCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1SetupIntentCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SetupIntent;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SetupIntentCreatedEventNotification.java b/src/main/java/com/stripe/events/V1SetupIntentCreatedEventNotification.java
index bf7ae700517..d758df84401 100644
--- a/src/main/java/com/stripe/events/V1SetupIntentCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SetupIntentCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SetupIntent;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SetupIntentRequiresActionEvent.java b/src/main/java/com/stripe/events/V1SetupIntentRequiresActionEvent.java
index 90170e0c369..7b3bac47e7c 100644
--- a/src/main/java/com/stripe/events/V1SetupIntentRequiresActionEvent.java
+++ b/src/main/java/com/stripe/events/V1SetupIntentRequiresActionEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SetupIntent;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SetupIntentRequiresActionEventNotification.java b/src/main/java/com/stripe/events/V1SetupIntentRequiresActionEventNotification.java
index aadce03b4a4..1f964cc99c7 100644
--- a/src/main/java/com/stripe/events/V1SetupIntentRequiresActionEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SetupIntentRequiresActionEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SetupIntent;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SetupIntentSetupFailedEvent.java b/src/main/java/com/stripe/events/V1SetupIntentSetupFailedEvent.java
index 5f36b65ec31..7eeb6209d59 100644
--- a/src/main/java/com/stripe/events/V1SetupIntentSetupFailedEvent.java
+++ b/src/main/java/com/stripe/events/V1SetupIntentSetupFailedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SetupIntent;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SetupIntentSetupFailedEventNotification.java b/src/main/java/com/stripe/events/V1SetupIntentSetupFailedEventNotification.java
index 4d36cff01a6..5f0a2d0337f 100644
--- a/src/main/java/com/stripe/events/V1SetupIntentSetupFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SetupIntentSetupFailedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SetupIntent;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SetupIntentSucceededEvent.java b/src/main/java/com/stripe/events/V1SetupIntentSucceededEvent.java
index 6aff1955be6..4de68c2a756 100644
--- a/src/main/java/com/stripe/events/V1SetupIntentSucceededEvent.java
+++ b/src/main/java/com/stripe/events/V1SetupIntentSucceededEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SetupIntent;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SetupIntentSucceededEventNotification.java b/src/main/java/com/stripe/events/V1SetupIntentSucceededEventNotification.java
index 25ece662912..f3cc2a1b332 100644
--- a/src/main/java/com/stripe/events/V1SetupIntentSucceededEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SetupIntentSucceededEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SetupIntent;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SigmaScheduledQueryRunCreatedEvent.java b/src/main/java/com/stripe/events/V1SigmaScheduledQueryRunCreatedEvent.java
index 31e6af4dc41..2ab4ef45c12 100644
--- a/src/main/java/com/stripe/events/V1SigmaScheduledQueryRunCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1SigmaScheduledQueryRunCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.sigma.ScheduledQueryRun;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SigmaScheduledQueryRunCreatedEventNotification.java b/src/main/java/com/stripe/events/V1SigmaScheduledQueryRunCreatedEventNotification.java
index 5c85f4bac37..d625e849c88 100644
--- a/src/main/java/com/stripe/events/V1SigmaScheduledQueryRunCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SigmaScheduledQueryRunCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.sigma.ScheduledQueryRun;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SourceCanceledEvent.java b/src/main/java/com/stripe/events/V1SourceCanceledEvent.java
index 93671740e6e..754d42df11a 100644
--- a/src/main/java/com/stripe/events/V1SourceCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V1SourceCanceledEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Source;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SourceCanceledEventNotification.java b/src/main/java/com/stripe/events/V1SourceCanceledEventNotification.java
index d98782ba9fa..c99ccff27e4 100644
--- a/src/main/java/com/stripe/events/V1SourceCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SourceCanceledEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Source;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SourceChargeableEvent.java b/src/main/java/com/stripe/events/V1SourceChargeableEvent.java
index 584bd3e89b8..f9410f6ba9d 100644
--- a/src/main/java/com/stripe/events/V1SourceChargeableEvent.java
+++ b/src/main/java/com/stripe/events/V1SourceChargeableEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Source;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SourceChargeableEventNotification.java b/src/main/java/com/stripe/events/V1SourceChargeableEventNotification.java
index 5db5b3beb06..e5bb59d2c12 100644
--- a/src/main/java/com/stripe/events/V1SourceChargeableEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SourceChargeableEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Source;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SourceFailedEvent.java b/src/main/java/com/stripe/events/V1SourceFailedEvent.java
index 98130b0fb83..5865fa071cd 100644
--- a/src/main/java/com/stripe/events/V1SourceFailedEvent.java
+++ b/src/main/java/com/stripe/events/V1SourceFailedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Source;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SourceFailedEventNotification.java b/src/main/java/com/stripe/events/V1SourceFailedEventNotification.java
index e826db8b237..8cdfe644e54 100644
--- a/src/main/java/com/stripe/events/V1SourceFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SourceFailedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Source;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SourceRefundAttributesRequiredEvent.java b/src/main/java/com/stripe/events/V1SourceRefundAttributesRequiredEvent.java
index 9e317a3e039..df97afae592 100644
--- a/src/main/java/com/stripe/events/V1SourceRefundAttributesRequiredEvent.java
+++ b/src/main/java/com/stripe/events/V1SourceRefundAttributesRequiredEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Source;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SourceRefundAttributesRequiredEventNotification.java b/src/main/java/com/stripe/events/V1SourceRefundAttributesRequiredEventNotification.java
index 1143a6ab1f4..9087c0284fc 100644
--- a/src/main/java/com/stripe/events/V1SourceRefundAttributesRequiredEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SourceRefundAttributesRequiredEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Source;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SubscriptionScheduleAbortedEvent.java b/src/main/java/com/stripe/events/V1SubscriptionScheduleAbortedEvent.java
index 47e191641cb..daf03ea9c54 100644
--- a/src/main/java/com/stripe/events/V1SubscriptionScheduleAbortedEvent.java
+++ b/src/main/java/com/stripe/events/V1SubscriptionScheduleAbortedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SubscriptionSchedule;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SubscriptionScheduleAbortedEventNotification.java b/src/main/java/com/stripe/events/V1SubscriptionScheduleAbortedEventNotification.java
index 5efb1dc4b2a..bfa481189e7 100644
--- a/src/main/java/com/stripe/events/V1SubscriptionScheduleAbortedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SubscriptionScheduleAbortedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SubscriptionSchedule;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SubscriptionScheduleCanceledEvent.java b/src/main/java/com/stripe/events/V1SubscriptionScheduleCanceledEvent.java
index 636fcf9b1fb..916ab06796a 100644
--- a/src/main/java/com/stripe/events/V1SubscriptionScheduleCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V1SubscriptionScheduleCanceledEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SubscriptionSchedule;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SubscriptionScheduleCanceledEventNotification.java b/src/main/java/com/stripe/events/V1SubscriptionScheduleCanceledEventNotification.java
index 456dff8d2fd..12d71b19bfe 100644
--- a/src/main/java/com/stripe/events/V1SubscriptionScheduleCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SubscriptionScheduleCanceledEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SubscriptionSchedule;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SubscriptionScheduleCompletedEvent.java b/src/main/java/com/stripe/events/V1SubscriptionScheduleCompletedEvent.java
index 6efa8dfea05..90619fafedd 100644
--- a/src/main/java/com/stripe/events/V1SubscriptionScheduleCompletedEvent.java
+++ b/src/main/java/com/stripe/events/V1SubscriptionScheduleCompletedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SubscriptionSchedule;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SubscriptionScheduleCompletedEventNotification.java b/src/main/java/com/stripe/events/V1SubscriptionScheduleCompletedEventNotification.java
index ed9dba7047a..cd4db971b86 100644
--- a/src/main/java/com/stripe/events/V1SubscriptionScheduleCompletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SubscriptionScheduleCompletedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SubscriptionSchedule;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SubscriptionScheduleCreatedEvent.java b/src/main/java/com/stripe/events/V1SubscriptionScheduleCreatedEvent.java
index e04e6aac6f6..4c6a069c5dd 100644
--- a/src/main/java/com/stripe/events/V1SubscriptionScheduleCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1SubscriptionScheduleCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SubscriptionSchedule;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SubscriptionScheduleCreatedEventNotification.java b/src/main/java/com/stripe/events/V1SubscriptionScheduleCreatedEventNotification.java
index 659b67b765b..1ca09492fe2 100644
--- a/src/main/java/com/stripe/events/V1SubscriptionScheduleCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SubscriptionScheduleCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SubscriptionSchedule;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SubscriptionScheduleExpiringEvent.java b/src/main/java/com/stripe/events/V1SubscriptionScheduleExpiringEvent.java
index 0d605d00960..c242674ae49 100644
--- a/src/main/java/com/stripe/events/V1SubscriptionScheduleExpiringEvent.java
+++ b/src/main/java/com/stripe/events/V1SubscriptionScheduleExpiringEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SubscriptionSchedule;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SubscriptionScheduleExpiringEventNotification.java b/src/main/java/com/stripe/events/V1SubscriptionScheduleExpiringEventNotification.java
index 8bf31f6ba0f..80c2e71794d 100644
--- a/src/main/java/com/stripe/events/V1SubscriptionScheduleExpiringEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SubscriptionScheduleExpiringEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SubscriptionSchedule;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SubscriptionScheduleReleasedEvent.java b/src/main/java/com/stripe/events/V1SubscriptionScheduleReleasedEvent.java
index 3f6e0fb7c90..e9f27a50dde 100644
--- a/src/main/java/com/stripe/events/V1SubscriptionScheduleReleasedEvent.java
+++ b/src/main/java/com/stripe/events/V1SubscriptionScheduleReleasedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SubscriptionSchedule;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SubscriptionScheduleReleasedEventNotification.java b/src/main/java/com/stripe/events/V1SubscriptionScheduleReleasedEventNotification.java
index 614a8c08e1f..70a638830df 100644
--- a/src/main/java/com/stripe/events/V1SubscriptionScheduleReleasedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SubscriptionScheduleReleasedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SubscriptionSchedule;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SubscriptionScheduleUpdatedEvent.java b/src/main/java/com/stripe/events/V1SubscriptionScheduleUpdatedEvent.java
index 3f6dab29d19..89bbfb4adb2 100644
--- a/src/main/java/com/stripe/events/V1SubscriptionScheduleUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1SubscriptionScheduleUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SubscriptionSchedule;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1SubscriptionScheduleUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1SubscriptionScheduleUpdatedEventNotification.java
index 77a4630ebff..fc146f0f221 100644
--- a/src/main/java/com/stripe/events/V1SubscriptionScheduleUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1SubscriptionScheduleUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.SubscriptionSchedule;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TaxRateCreatedEvent.java b/src/main/java/com/stripe/events/V1TaxRateCreatedEvent.java
index 60584a49b77..dcb538fa4a4 100644
--- a/src/main/java/com/stripe/events/V1TaxRateCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1TaxRateCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.TaxRate;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TaxRateCreatedEventNotification.java b/src/main/java/com/stripe/events/V1TaxRateCreatedEventNotification.java
index 7fb63f16064..d1c74f6cb5d 100644
--- a/src/main/java/com/stripe/events/V1TaxRateCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TaxRateCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.TaxRate;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TaxRateUpdatedEvent.java b/src/main/java/com/stripe/events/V1TaxRateUpdatedEvent.java
index 6d62b0bac6f..661b7ab35da 100644
--- a/src/main/java/com/stripe/events/V1TaxRateUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1TaxRateUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.TaxRate;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TaxRateUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1TaxRateUpdatedEventNotification.java
index 91aacd6ac21..0c3b7fcd6b5 100644
--- a/src/main/java/com/stripe/events/V1TaxRateUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TaxRateUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.TaxRate;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TerminalReaderActionFailedEvent.java b/src/main/java/com/stripe/events/V1TerminalReaderActionFailedEvent.java
index 9e1bdd4bd6d..26d65246851 100644
--- a/src/main/java/com/stripe/events/V1TerminalReaderActionFailedEvent.java
+++ b/src/main/java/com/stripe/events/V1TerminalReaderActionFailedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.terminal.Reader;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TerminalReaderActionFailedEventNotification.java b/src/main/java/com/stripe/events/V1TerminalReaderActionFailedEventNotification.java
index 3aeba8678e7..3f472875457 100644
--- a/src/main/java/com/stripe/events/V1TerminalReaderActionFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TerminalReaderActionFailedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.terminal.Reader;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TerminalReaderActionSucceededEvent.java b/src/main/java/com/stripe/events/V1TerminalReaderActionSucceededEvent.java
index 5c8171baaa5..54654a2152c 100644
--- a/src/main/java/com/stripe/events/V1TerminalReaderActionSucceededEvent.java
+++ b/src/main/java/com/stripe/events/V1TerminalReaderActionSucceededEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.terminal.Reader;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TerminalReaderActionSucceededEventNotification.java b/src/main/java/com/stripe/events/V1TerminalReaderActionSucceededEventNotification.java
index 5797f051484..5983f4664e6 100644
--- a/src/main/java/com/stripe/events/V1TerminalReaderActionSucceededEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TerminalReaderActionSucceededEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.terminal.Reader;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TerminalReaderActionUpdatedEvent.java b/src/main/java/com/stripe/events/V1TerminalReaderActionUpdatedEvent.java
index 3890309849b..23e427c2e83 100644
--- a/src/main/java/com/stripe/events/V1TerminalReaderActionUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1TerminalReaderActionUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.terminal.Reader;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TerminalReaderActionUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1TerminalReaderActionUpdatedEventNotification.java
index dfe9c11d0ce..d1ae49d3f9f 100644
--- a/src/main/java/com/stripe/events/V1TerminalReaderActionUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TerminalReaderActionUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.terminal.Reader;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TestHelpersTestClockAdvancingEvent.java b/src/main/java/com/stripe/events/V1TestHelpersTestClockAdvancingEvent.java
index 45556aeaab3..e108af6cda4 100644
--- a/src/main/java/com/stripe/events/V1TestHelpersTestClockAdvancingEvent.java
+++ b/src/main/java/com/stripe/events/V1TestHelpersTestClockAdvancingEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.testhelpers.TestClock;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TestHelpersTestClockAdvancingEventNotification.java b/src/main/java/com/stripe/events/V1TestHelpersTestClockAdvancingEventNotification.java
index 1a3368a2cc4..22d80b5c9d0 100644
--- a/src/main/java/com/stripe/events/V1TestHelpersTestClockAdvancingEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TestHelpersTestClockAdvancingEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.testhelpers.TestClock;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TestHelpersTestClockCreatedEvent.java b/src/main/java/com/stripe/events/V1TestHelpersTestClockCreatedEvent.java
index e37b96db11d..63cf2a29b37 100644
--- a/src/main/java/com/stripe/events/V1TestHelpersTestClockCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1TestHelpersTestClockCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.testhelpers.TestClock;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TestHelpersTestClockCreatedEventNotification.java b/src/main/java/com/stripe/events/V1TestHelpersTestClockCreatedEventNotification.java
index da1e6b4e5d3..7374feb1a53 100644
--- a/src/main/java/com/stripe/events/V1TestHelpersTestClockCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TestHelpersTestClockCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.testhelpers.TestClock;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TestHelpersTestClockDeletedEvent.java b/src/main/java/com/stripe/events/V1TestHelpersTestClockDeletedEvent.java
index 325b44002ef..279a6260154 100644
--- a/src/main/java/com/stripe/events/V1TestHelpersTestClockDeletedEvent.java
+++ b/src/main/java/com/stripe/events/V1TestHelpersTestClockDeletedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.testhelpers.TestClock;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TestHelpersTestClockDeletedEventNotification.java b/src/main/java/com/stripe/events/V1TestHelpersTestClockDeletedEventNotification.java
index e518edda070..916d2b60128 100644
--- a/src/main/java/com/stripe/events/V1TestHelpersTestClockDeletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TestHelpersTestClockDeletedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.testhelpers.TestClock;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TestHelpersTestClockInternalFailureEvent.java b/src/main/java/com/stripe/events/V1TestHelpersTestClockInternalFailureEvent.java
index 093b3d2c684..64bd7b001d7 100644
--- a/src/main/java/com/stripe/events/V1TestHelpersTestClockInternalFailureEvent.java
+++ b/src/main/java/com/stripe/events/V1TestHelpersTestClockInternalFailureEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.testhelpers.TestClock;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TestHelpersTestClockInternalFailureEventNotification.java b/src/main/java/com/stripe/events/V1TestHelpersTestClockInternalFailureEventNotification.java
index 0de6e72f200..f0d14cc7578 100644
--- a/src/main/java/com/stripe/events/V1TestHelpersTestClockInternalFailureEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TestHelpersTestClockInternalFailureEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.testhelpers.TestClock;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TestHelpersTestClockReadyEvent.java b/src/main/java/com/stripe/events/V1TestHelpersTestClockReadyEvent.java
index c2164cec913..4ed376f2849 100644
--- a/src/main/java/com/stripe/events/V1TestHelpersTestClockReadyEvent.java
+++ b/src/main/java/com/stripe/events/V1TestHelpersTestClockReadyEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.testhelpers.TestClock;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TestHelpersTestClockReadyEventNotification.java b/src/main/java/com/stripe/events/V1TestHelpersTestClockReadyEventNotification.java
index dd725b5de68..ce8d7a83595 100644
--- a/src/main/java/com/stripe/events/V1TestHelpersTestClockReadyEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TestHelpersTestClockReadyEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.testhelpers.TestClock;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TopupCanceledEvent.java b/src/main/java/com/stripe/events/V1TopupCanceledEvent.java
index 6734d25a170..5556d6fb159 100644
--- a/src/main/java/com/stripe/events/V1TopupCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V1TopupCanceledEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Topup;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TopupCanceledEventNotification.java b/src/main/java/com/stripe/events/V1TopupCanceledEventNotification.java
index c17f934dd30..ce47e3f8f6d 100644
--- a/src/main/java/com/stripe/events/V1TopupCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TopupCanceledEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Topup;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TopupCreatedEvent.java b/src/main/java/com/stripe/events/V1TopupCreatedEvent.java
index d72667eb25d..cb1c3a150f7 100644
--- a/src/main/java/com/stripe/events/V1TopupCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1TopupCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Topup;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TopupCreatedEventNotification.java b/src/main/java/com/stripe/events/V1TopupCreatedEventNotification.java
index 97c2f289374..389356b8e83 100644
--- a/src/main/java/com/stripe/events/V1TopupCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TopupCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Topup;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TopupFailedEvent.java b/src/main/java/com/stripe/events/V1TopupFailedEvent.java
index 3970659b6bc..d27773430c2 100644
--- a/src/main/java/com/stripe/events/V1TopupFailedEvent.java
+++ b/src/main/java/com/stripe/events/V1TopupFailedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Topup;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TopupFailedEventNotification.java b/src/main/java/com/stripe/events/V1TopupFailedEventNotification.java
index acc93feb46a..dae44cd28c1 100644
--- a/src/main/java/com/stripe/events/V1TopupFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TopupFailedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Topup;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TopupReversedEvent.java b/src/main/java/com/stripe/events/V1TopupReversedEvent.java
index a82988bb805..e3bb4207e3f 100644
--- a/src/main/java/com/stripe/events/V1TopupReversedEvent.java
+++ b/src/main/java/com/stripe/events/V1TopupReversedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Topup;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TopupReversedEventNotification.java b/src/main/java/com/stripe/events/V1TopupReversedEventNotification.java
index 809332ca7b8..f67b82f28e2 100644
--- a/src/main/java/com/stripe/events/V1TopupReversedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TopupReversedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Topup;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TopupSucceededEvent.java b/src/main/java/com/stripe/events/V1TopupSucceededEvent.java
index 820f6aa659b..dcf68c4e301 100644
--- a/src/main/java/com/stripe/events/V1TopupSucceededEvent.java
+++ b/src/main/java/com/stripe/events/V1TopupSucceededEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Topup;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TopupSucceededEventNotification.java b/src/main/java/com/stripe/events/V1TopupSucceededEventNotification.java
index 6b390b72f3c..e600914ba86 100644
--- a/src/main/java/com/stripe/events/V1TopupSucceededEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TopupSucceededEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Topup;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TransferCreatedEvent.java b/src/main/java/com/stripe/events/V1TransferCreatedEvent.java
index fd87a295ed3..28fe4c9dab3 100644
--- a/src/main/java/com/stripe/events/V1TransferCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V1TransferCreatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Transfer;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TransferCreatedEventNotification.java b/src/main/java/com/stripe/events/V1TransferCreatedEventNotification.java
index 25aa74b329c..1efa3dd04da 100644
--- a/src/main/java/com/stripe/events/V1TransferCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TransferCreatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Transfer;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TransferReversedEvent.java b/src/main/java/com/stripe/events/V1TransferReversedEvent.java
index e7cb62f647d..8c89bf480c0 100644
--- a/src/main/java/com/stripe/events/V1TransferReversedEvent.java
+++ b/src/main/java/com/stripe/events/V1TransferReversedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Transfer;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TransferReversedEventNotification.java b/src/main/java/com/stripe/events/V1TransferReversedEventNotification.java
index 3124af95fda..dcdf25b3a53 100644
--- a/src/main/java/com/stripe/events/V1TransferReversedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TransferReversedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Transfer;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TransferUpdatedEvent.java b/src/main/java/com/stripe/events/V1TransferUpdatedEvent.java
index 39641e00d6b..94c7d339fa5 100644
--- a/src/main/java/com/stripe/events/V1TransferUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V1TransferUpdatedEvent.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Transfer;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V1TransferUpdatedEventNotification.java b/src/main/java/com/stripe/events/V1TransferUpdatedEventNotification.java
index 9feb7fdf1fe..98a74a1d17c 100644
--- a/src/main/java/com/stripe/events/V1TransferUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V1TransferUpdatedEventNotification.java
@@ -4,8 +4,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
 import com.stripe.model.Transfer;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingBillSettingUpdatedEvent.java b/src/main/java/com/stripe/events/V2BillingBillSettingUpdatedEvent.java
index 2d6084b5886..9efdc01d006 100644
--- a/src/main/java/com/stripe/events/V2BillingBillSettingUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingBillSettingUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.BillSetting;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2BillingBillSettingUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingBillSettingUpdatedEventNotification.java
index 9af45757d7e..2ab8a832875 100644
--- a/src/main/java/com/stripe/events/V2BillingBillSettingUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingBillSettingUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.BillSetting;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingCadenceBilledEvent.java b/src/main/java/com/stripe/events/V2BillingCadenceBilledEvent.java
index 7224c3f64d3..026768ae5f3 100644
--- a/src/main/java/com/stripe/events/V2BillingCadenceBilledEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingCadenceBilledEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.Cadence;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2BillingCadenceBilledEventNotification.java b/src/main/java/com/stripe/events/V2BillingCadenceBilledEventNotification.java
index 2ce75dd2c24..d9f0e19d70a 100644
--- a/src/main/java/com/stripe/events/V2BillingCadenceBilledEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingCadenceBilledEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.Cadence;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingCadenceCanceledEvent.java b/src/main/java/com/stripe/events/V2BillingCadenceCanceledEvent.java
index 4915ba245db..6edcb45e3b5 100644
--- a/src/main/java/com/stripe/events/V2BillingCadenceCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingCadenceCanceledEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.Cadence;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingCadenceCanceledEventNotification.java b/src/main/java/com/stripe/events/V2BillingCadenceCanceledEventNotification.java
index 526c8414ab0..f4bbf1750b8 100644
--- a/src/main/java/com/stripe/events/V2BillingCadenceCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingCadenceCanceledEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.Cadence;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingCadenceCreatedEvent.java b/src/main/java/com/stripe/events/V2BillingCadenceCreatedEvent.java
index f18a4d8bb4b..a55a3a95405 100644
--- a/src/main/java/com/stripe/events/V2BillingCadenceCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingCadenceCreatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.Cadence;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2BillingCadenceCreatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingCadenceCreatedEventNotification.java
index c0689e76850..b3bc52f3ce7 100644
--- a/src/main/java/com/stripe/events/V2BillingCadenceCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingCadenceCreatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.Cadence;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingLicenseFeeCreatedEvent.java b/src/main/java/com/stripe/events/V2BillingLicenseFeeCreatedEvent.java
index cd8eb37dc35..7da9430f30d 100644
--- a/src/main/java/com/stripe/events/V2BillingLicenseFeeCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingLicenseFeeCreatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.LicenseFee;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingLicenseFeeCreatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingLicenseFeeCreatedEventNotification.java
index b4551c35ba1..b3e8d25b817 100644
--- a/src/main/java/com/stripe/events/V2BillingLicenseFeeCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingLicenseFeeCreatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.LicenseFee;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingLicenseFeeUpdatedEvent.java b/src/main/java/com/stripe/events/V2BillingLicenseFeeUpdatedEvent.java
index a56a6066b1c..7ececb7bfee 100644
--- a/src/main/java/com/stripe/events/V2BillingLicenseFeeUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingLicenseFeeUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.LicenseFee;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingLicenseFeeUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingLicenseFeeUpdatedEventNotification.java
index 76a6bf82f27..bcda07ba102 100644
--- a/src/main/java/com/stripe/events/V2BillingLicenseFeeUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingLicenseFeeUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.LicenseFee;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingLicenseFeeVersionCreatedEvent.java b/src/main/java/com/stripe/events/V2BillingLicenseFeeVersionCreatedEvent.java
index e5dfeb1f595..9e350f7a6d5 100644
--- a/src/main/java/com/stripe/events/V2BillingLicenseFeeVersionCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingLicenseFeeVersionCreatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.LicenseFeeVersion;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/com/stripe/events/V2BillingLicenseFeeVersionCreatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingLicenseFeeVersionCreatedEventNotification.java
index 4ab9d7552e3..0fa4b2453c8 100644
--- a/src/main/java/com/stripe/events/V2BillingLicenseFeeVersionCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingLicenseFeeVersionCreatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.LicenseFeeVersion;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingLicensedItemCreatedEvent.java b/src/main/java/com/stripe/events/V2BillingLicensedItemCreatedEvent.java
index 4adc7808c86..c5f0158bc05 100644
--- a/src/main/java/com/stripe/events/V2BillingLicensedItemCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingLicensedItemCreatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.LicensedItem;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingLicensedItemCreatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingLicensedItemCreatedEventNotification.java
index b963f96f192..87baecfbc94 100644
--- a/src/main/java/com/stripe/events/V2BillingLicensedItemCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingLicensedItemCreatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.LicensedItem;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingLicensedItemUpdatedEvent.java b/src/main/java/com/stripe/events/V2BillingLicensedItemUpdatedEvent.java
index 8f5ec0ebe51..fa5399ae623 100644
--- a/src/main/java/com/stripe/events/V2BillingLicensedItemUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingLicensedItemUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.LicensedItem;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingLicensedItemUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingLicensedItemUpdatedEventNotification.java
index d7dd3783c49..bcecdd0a2fc 100644
--- a/src/main/java/com/stripe/events/V2BillingLicensedItemUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingLicensedItemUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.LicensedItem;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingMeteredItemCreatedEvent.java b/src/main/java/com/stripe/events/V2BillingMeteredItemCreatedEvent.java
index 7b3f433808e..7379c5bde9a 100644
--- a/src/main/java/com/stripe/events/V2BillingMeteredItemCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingMeteredItemCreatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.MeteredItem;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingMeteredItemCreatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingMeteredItemCreatedEventNotification.java
index 0ee64016f40..7d72d88352d 100644
--- a/src/main/java/com/stripe/events/V2BillingMeteredItemCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingMeteredItemCreatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.MeteredItem;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingMeteredItemUpdatedEvent.java b/src/main/java/com/stripe/events/V2BillingMeteredItemUpdatedEvent.java
index 9a41088cfdf..f08cff2aede 100644
--- a/src/main/java/com/stripe/events/V2BillingMeteredItemUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingMeteredItemUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.MeteredItem;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingMeteredItemUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingMeteredItemUpdatedEventNotification.java
index 4c1c2126d63..41ab3ecb1dc 100644
--- a/src/main/java/com/stripe/events/V2BillingMeteredItemUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingMeteredItemUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.MeteredItem;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanComponentCreatedEvent.java b/src/main/java/com/stripe/events/V2BillingPricingPlanComponentCreatedEvent.java
index 2104655cfec..0c990ab94f3 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanComponentCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanComponentCreatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.PricingPlanComponent;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanComponentCreatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingPricingPlanComponentCreatedEventNotification.java
index e91a05bb256..1ebfba76ad8 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanComponentCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanComponentCreatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.PricingPlanComponent;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanComponentUpdatedEvent.java b/src/main/java/com/stripe/events/V2BillingPricingPlanComponentUpdatedEvent.java
index b1fd0ffedbc..21d5e0f8024 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanComponentUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanComponentUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.PricingPlanComponent;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanComponentUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingPricingPlanComponentUpdatedEventNotification.java
index 32cffe1f50a..5a758beaa57 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanComponentUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanComponentUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.PricingPlanComponent;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanCreatedEvent.java b/src/main/java/com/stripe/events/V2BillingPricingPlanCreatedEvent.java
index 6f803944b03..9550611d8cb 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanCreatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.PricingPlan;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanCreatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingPricingPlanCreatedEventNotification.java
index ed0bb988b45..7fee10d4187 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanCreatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.PricingPlan;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionAwaitingCustomerActionEvent.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionAwaitingCustomerActionEvent.java
index e748aa65c72..bfa5ef7b75e 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionAwaitingCustomerActionEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionAwaitingCustomerActionEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionAwaitingCustomerActionEventNotification.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionAwaitingCustomerActionEventNotification.java
index 4f5a6758e91..596628b5762 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionAwaitingCustomerActionEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionAwaitingCustomerActionEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionCurrentEvent.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionCurrentEvent.java
index 220aaae4ff8..9e88e44390b 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionCurrentEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionCurrentEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionCurrentEventNotification.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionCurrentEventNotification.java
index f68b66f260a..d39edb76210 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionCurrentEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionCurrentEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPastDueEvent.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPastDueEvent.java
index 0bf06c70b3b..2bd48553bc1 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPastDueEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPastDueEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPastDueEventNotification.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPastDueEventNotification.java
index ad05a13bc01..ed21c4d5b90 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPastDueEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPastDueEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPausedEvent.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPausedEvent.java
index 8b7e215e2a8..1098a5edfd1 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPausedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPausedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPausedEventNotification.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPausedEventNotification.java
index 1174bab71d7..1e36dbe2fb4 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPausedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionPausedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionUnpaidEvent.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionUnpaidEvent.java
index dac8583e02e..adaa5f93eac 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionUnpaidEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionUnpaidEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionUnpaidEventNotification.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionUnpaidEventNotification.java
index 234c51052be..c61ade25b34 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionUnpaidEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionCollectionUnpaidEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingActivatedEvent.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingActivatedEvent.java
index 551002fb142..0c1b34372b0 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingActivatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingActivatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingActivatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingActivatedEventNotification.java
index fa431351094..805f07bda8c 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingActivatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingActivatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingCanceledEvent.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingCanceledEvent.java
index f19a3046973..aa8d80186b4 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingCanceledEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingCanceledEventNotification.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingCanceledEventNotification.java
index 1e066881f79..5c834051be1 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingCanceledEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingPausedEvent.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingPausedEvent.java
index 820332f81ea..fd4f1120484 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingPausedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingPausedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingPausedEventNotification.java b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingPausedEventNotification.java
index 18ff4766072..788c4aafde0 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingPausedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanSubscriptionServicingPausedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.PricingPlanSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanUpdatedEvent.java b/src/main/java/com/stripe/events/V2BillingPricingPlanUpdatedEvent.java
index e5b2f457f9d..257c89d0c91 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.PricingPlan;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingPricingPlanUpdatedEventNotification.java
index f0b5de55b11..9762448892f 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.PricingPlan;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanVersionCreatedEvent.java b/src/main/java/com/stripe/events/V2BillingPricingPlanVersionCreatedEvent.java
index 10fcf7583d3..edfb377713f 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanVersionCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanVersionCreatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.PricingPlanVersion;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/com/stripe/events/V2BillingPricingPlanVersionCreatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingPricingPlanVersionCreatedEventNotification.java
index 7cc0bf3c598..603faece069 100644
--- a/src/main/java/com/stripe/events/V2BillingPricingPlanVersionCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingPricingPlanVersionCreatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.PricingPlanVersion;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardCreatedEvent.java b/src/main/java/com/stripe/events/V2BillingRateCardCreatedEvent.java
index 15ec129ed23..57282638959 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardCreatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.RateCard;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardCreatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingRateCardCreatedEventNotification.java
index 1e3f9e05f20..d07fce9e41a 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardCreatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.RateCard;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardRateCreatedEvent.java b/src/main/java/com/stripe/events/V2BillingRateCardRateCreatedEvent.java
index cc502a99125..5c3c189872b 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardRateCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardRateCreatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.RateCardRate;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardRateCreatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingRateCardRateCreatedEventNotification.java
index c791c7d168f..2bce2093945 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardRateCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardRateCreatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.RateCardRate;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionActivatedEvent.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionActivatedEvent.java
index 84fd3f5aa88..cb5fc2dd3cc 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionActivatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionActivatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionActivatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionActivatedEventNotification.java
index 38e98a67ab2..544b9a898e0 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionActivatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionActivatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCanceledEvent.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCanceledEvent.java
index 7aa7409708f..6aa7b81edb1 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCanceledEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCanceledEventNotification.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCanceledEventNotification.java
index 04a4c07c05f..435e8510c67 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCanceledEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionAwaitingCustomerActionEvent.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionAwaitingCustomerActionEvent.java
index 0736c19db64..f4645443992 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionAwaitingCustomerActionEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionAwaitingCustomerActionEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionAwaitingCustomerActionEventNotification.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionAwaitingCustomerActionEventNotification.java
index c3d09d3a879..0d887e893dc 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionAwaitingCustomerActionEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionAwaitingCustomerActionEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionCurrentEvent.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionCurrentEvent.java
index 9274fca2de9..c9d57b3d755 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionCurrentEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionCurrentEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionCurrentEventNotification.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionCurrentEventNotification.java
index 11a10d96fb9..1411214e85f 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionCurrentEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionCurrentEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPastDueEvent.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPastDueEvent.java
index f7ff491c0ae..ea4f4f31737 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPastDueEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPastDueEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPastDueEventNotification.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPastDueEventNotification.java
index 7636734ec03..c09f18784cc 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPastDueEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPastDueEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPausedEvent.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPausedEvent.java
index 19322704147..320d59f2681 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPausedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPausedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPausedEventNotification.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPausedEventNotification.java
index ca76996ba0b..ca3196adae5 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPausedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionPausedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionUnpaidEvent.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionUnpaidEvent.java
index e31595521ab..12b597765f5 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionUnpaidEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionUnpaidEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionUnpaidEventNotification.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionUnpaidEventNotification.java
index 3ba4d15c842..12a125532ba 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionUnpaidEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionCollectionUnpaidEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingActivatedEvent.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingActivatedEvent.java
index 1c233bc4582..6a57ea659f2 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingActivatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingActivatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingActivatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingActivatedEventNotification.java
index 866d095cd44..843b745f718 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingActivatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingActivatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingCanceledEvent.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingCanceledEvent.java
index f836173dbfb..03886a333ce 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingCanceledEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingCanceledEventNotification.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingCanceledEventNotification.java
index e5e840bfab5..b62de9b0376 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingCanceledEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingPausedEvent.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingPausedEvent.java
index a897663164c..a32074e1ee8 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingPausedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingPausedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingPausedEventNotification.java b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingPausedEventNotification.java
index 747743d6433..f79a2a632b0 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingPausedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardSubscriptionServicingPausedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.RateCardSubscription;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardUpdatedEvent.java b/src/main/java/com/stripe/events/V2BillingRateCardUpdatedEvent.java
index 4afebef8adf..a3a0821136b 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.RateCard;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingRateCardUpdatedEventNotification.java
index 4072332e187..68dd822e8e6 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.RateCard;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardVersionCreatedEvent.java b/src/main/java/com/stripe/events/V2BillingRateCardVersionCreatedEvent.java
index 453597430ac..475dce7e1b2 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardVersionCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardVersionCreatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.billing.RateCardVersion;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/com/stripe/events/V2BillingRateCardVersionCreatedEventNotification.java b/src/main/java/com/stripe/events/V2BillingRateCardVersionCreatedEventNotification.java
index 48d4d289ac5..37858b90b6b 100644
--- a/src/main/java/com/stripe/events/V2BillingRateCardVersionCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2BillingRateCardVersionCreatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.billing.RateCardVersion;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountClosedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountClosedEvent.java
index 8e1550bb8a0..05a2445690b 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountClosedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountClosedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountClosedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountClosedEventNotification.java
index 112474652cf..d677d1b4539 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountClosedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountClosedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountCreatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountCreatedEvent.java
index b58d08beedf..cbfdfc4f5d3 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountCreatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountCreatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountCreatedEventNotification.java
index 20f06885b75..e0529a8b8cc 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountCreatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerCapabilityStatusUpdatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerCapabilityStatusUpdatedEvent.java
index 5d8a3bfb498..e266dd315f6 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerCapabilityStatusUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerCapabilityStatusUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerCapabilityStatusUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerCapabilityStatusUpdatedEventNotification.java
index 9fe85d2ef2b..c203c68e6fe 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerCapabilityStatusUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerCapabilityStatusUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerUpdatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerUpdatedEvent.java
index 900ef39bc56..eaf8240c359 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerUpdatedEventNotification.java
index d53a3147f98..4cf4b375336 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationCustomerUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantCapabilityStatusUpdatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantCapabilityStatusUpdatedEvent.java
index 5cfd9900bb3..b9d23142347 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantCapabilityStatusUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantCapabilityStatusUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantCapabilityStatusUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantCapabilityStatusUpdatedEventNotification.java
index 1ee2665d742..a651119b0b6 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantCapabilityStatusUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantCapabilityStatusUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantUpdatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantUpdatedEvent.java
index b82a7027f87..5d525b9faf3 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantUpdatedEventNotification.java
index 579890ec4a4..c531238467b 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationMerchantUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientCapabilityStatusUpdatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientCapabilityStatusUpdatedEvent.java
index 26fb2a6db7a..130cb035924 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientCapabilityStatusUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientCapabilityStatusUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientCapabilityStatusUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientCapabilityStatusUpdatedEventNotification.java
index ed594d7a539..11072827081 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientCapabilityStatusUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientCapabilityStatusUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientUpdatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientUpdatedEvent.java
index 54d60c31637..9215345d6f4 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientUpdatedEventNotification.java
index 6833033286a..bdc8b261a09 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationRecipientUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerCapabilityStatusUpdatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerCapabilityStatusUpdatedEvent.java
index 0a0ca2b4967..63af1f64520 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerCapabilityStatusUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerCapabilityStatusUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerCapabilityStatusUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerCapabilityStatusUpdatedEventNotification.java
index 289eb4f0abe..90a72ddc20a 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerCapabilityStatusUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerCapabilityStatusUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerUpdatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerUpdatedEvent.java
index 89701f76748..cbb365f91cf 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerUpdatedEventNotification.java
index 6d8159e99a6..1f153afe6cc 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingConfigurationStorerUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingDefaultsUpdatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingDefaultsUpdatedEvent.java
index 9df07897f72..468bd1b4a8a 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingDefaultsUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingDefaultsUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingDefaultsUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingDefaultsUpdatedEventNotification.java
index 2362fac5797..d7e23077bfd 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingDefaultsUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingDefaultsUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingIdentityUpdatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingIdentityUpdatedEvent.java
index a2ca6417c0b..0e39b973f3e 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingIdentityUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingIdentityUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingIdentityUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingIdentityUpdatedEventNotification.java
index 8c5cb570aee..fbadf63c66c 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingIdentityUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingIdentityUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingRequirementsUpdatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingRequirementsUpdatedEvent.java
index ae6db587a21..8772e2c6727 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingRequirementsUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingRequirementsUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountIncludingRequirementsUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountIncludingRequirementsUpdatedEventNotification.java
index 6d99ccac484..5c0246387b5 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountIncludingRequirementsUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountIncludingRequirementsUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountLinkReturnedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountLinkReturnedEvent.java
index 54817bf3e04..8853cb981fd 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountLinkReturnedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountLinkReturnedEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2CoreAccountLinkReturnedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountLinkReturnedEventNotification.java
index 22c01a82692..447b6909d19 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountLinkReturnedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountLinkReturnedEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreAccountLinkReturnedEventNotification extends EventNotification {
   /** Retrieve the corresponding full event from the Stripe API. */
diff --git a/src/main/java/com/stripe/events/V2CoreAccountPersonCreatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountPersonCreatedEvent.java
index 8ea68e3c48d..31eb01d754c 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountPersonCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountPersonCreatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.AccountPerson;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/com/stripe/events/V2CoreAccountPersonCreatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountPersonCreatedEventNotification.java
index 0d981e7e5b4..52159283b25 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountPersonCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountPersonCreatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.AccountPerson;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountPersonDeletedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountPersonDeletedEvent.java
index 2b1c403623c..54168d8031d 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountPersonDeletedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountPersonDeletedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.AccountPerson;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/com/stripe/events/V2CoreAccountPersonDeletedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountPersonDeletedEventNotification.java
index 06e3ac8b55e..ccdfef19c4c 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountPersonDeletedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountPersonDeletedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.AccountPerson;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountPersonUpdatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountPersonUpdatedEvent.java
index 0b17ebd2c0a..d9f19f199c2 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountPersonUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountPersonUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.AccountPerson;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/com/stripe/events/V2CoreAccountPersonUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountPersonUpdatedEventNotification.java
index b6789389c37..7d9c09bccd0 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountPersonUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountPersonUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.AccountPerson;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountUpdatedEvent.java b/src/main/java/com/stripe/events/V2CoreAccountUpdatedEvent.java
index e76cb2c21a4..767204a5eef 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreAccountUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreAccountUpdatedEventNotification.java
index 60fcb1a50d6..6ecdb7e9f6d 100644
--- a/src/main/java/com/stripe/events/V2CoreAccountUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreAccountUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.Account;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreClaimableSandboxClaimedEvent.java b/src/main/java/com/stripe/events/V2CoreClaimableSandboxClaimedEvent.java
index 5234309c80d..6bcb87dcdac 100644
--- a/src/main/java/com/stripe/events/V2CoreClaimableSandboxClaimedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreClaimableSandboxClaimedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.ClaimableSandbox;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreClaimableSandboxClaimedEventNotification.java b/src/main/java/com/stripe/events/V2CoreClaimableSandboxClaimedEventNotification.java
index f1842418ec3..c0e96cc228f 100644
--- a/src/main/java/com/stripe/events/V2CoreClaimableSandboxClaimedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreClaimableSandboxClaimedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.ClaimableSandbox;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreClaimableSandboxCreatedEvent.java b/src/main/java/com/stripe/events/V2CoreClaimableSandboxCreatedEvent.java
index 823f84448c6..393754bca26 100644
--- a/src/main/java/com/stripe/events/V2CoreClaimableSandboxCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreClaimableSandboxCreatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.ClaimableSandbox;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreClaimableSandboxCreatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreClaimableSandboxCreatedEventNotification.java
index 13d5553f452..c287895e8d7 100644
--- a/src/main/java/com/stripe/events/V2CoreClaimableSandboxCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreClaimableSandboxCreatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.ClaimableSandbox;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiredEvent.java b/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiredEvent.java
index ca388d7edfa..dc916f1447e 100644
--- a/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiredEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiredEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.ClaimableSandbox;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiredEventNotification.java b/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiredEventNotification.java
index eb03e4702c2..f399084b800 100644
--- a/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiredEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiredEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.ClaimableSandbox;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiringEvent.java b/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiringEvent.java
index 1fb51ebe8c4..7001c8b1caa 100644
--- a/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiringEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiringEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.ClaimableSandbox;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiringEventNotification.java b/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiringEventNotification.java
index 175ee2b0141..4eeead1cce9 100644
--- a/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiringEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreClaimableSandboxExpiringEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.ClaimableSandbox;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreClaimableSandboxSandboxDetailsOwnerAccountUpdatedEvent.java b/src/main/java/com/stripe/events/V2CoreClaimableSandboxSandboxDetailsOwnerAccountUpdatedEvent.java
index 1b73c46dcfb..dfeaf184cec 100644
--- a/src/main/java/com/stripe/events/V2CoreClaimableSandboxSandboxDetailsOwnerAccountUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreClaimableSandboxSandboxDetailsOwnerAccountUpdatedEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
 import com.stripe.model.v2.core.ClaimableSandbox;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreClaimableSandboxSandboxDetailsOwnerAccountUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2CoreClaimableSandboxSandboxDetailsOwnerAccountUpdatedEventNotification.java
index 4ebdbf54338..9d58f367f71 100644
--- a/src/main/java/com/stripe/events/V2CoreClaimableSandboxSandboxDetailsOwnerAccountUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreClaimableSandboxSandboxDetailsOwnerAccountUpdatedEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
 import com.stripe.model.v2.core.ClaimableSandbox;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreEventDestinationPingEvent.java b/src/main/java/com/stripe/events/V2CoreEventDestinationPingEvent.java
index f56280dc61d..fbd5f8bbba2 100644
--- a/src/main/java/com/stripe/events/V2CoreEventDestinationPingEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreEventDestinationPingEvent.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventDestination;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventDestination;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreEventDestinationPingEventNotification.java b/src/main/java/com/stripe/events/V2CoreEventDestinationPingEventNotification.java
index e6d0c7da525..4fc652b22c7 100644
--- a/src/main/java/com/stripe/events/V2CoreEventDestinationPingEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreEventDestinationPingEventNotification.java
@@ -3,9 +3,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventDestination;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventDestination;
+import com.stripe.model.v2.core.EventNotification;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/com/stripe/events/V2CoreHealthApiErrorFiringEvent.java b/src/main/java/com/stripe/events/V2CoreHealthApiErrorFiringEvent.java
index 1a129d89aad..72f07bf4bf6 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthApiErrorFiringEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthApiErrorFiringEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthApiErrorFiringEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthApiErrorFiringEventNotification.java
index 295f229997f..b29d3bb0a9a 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthApiErrorFiringEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthApiErrorFiringEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthApiErrorFiringEventNotification extends EventNotification {
   /** Retrieve the corresponding full event from the Stripe API. */
diff --git a/src/main/java/com/stripe/events/V2CoreHealthApiErrorResolvedEvent.java b/src/main/java/com/stripe/events/V2CoreHealthApiErrorResolvedEvent.java
index 8ecdbbf3ee0..49f58e41fef 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthApiErrorResolvedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthApiErrorResolvedEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthApiErrorResolvedEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthApiErrorResolvedEventNotification.java
index 19431a01904..c312822f2bd 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthApiErrorResolvedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthApiErrorResolvedEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthApiErrorResolvedEventNotification extends EventNotification {
   /** Retrieve the corresponding full event from the Stripe API. */
diff --git a/src/main/java/com/stripe/events/V2CoreHealthApiLatencyFiringEvent.java b/src/main/java/com/stripe/events/V2CoreHealthApiLatencyFiringEvent.java
index 88fa8bd3623..0acde06ba99 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthApiLatencyFiringEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthApiLatencyFiringEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthApiLatencyFiringEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthApiLatencyFiringEventNotification.java
index c712ab21735..391d86d0851 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthApiLatencyFiringEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthApiLatencyFiringEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthApiLatencyFiringEventNotification extends EventNotification {
   /** Retrieve the corresponding full event from the Stripe API. */
diff --git a/src/main/java/com/stripe/events/V2CoreHealthApiLatencyResolvedEvent.java b/src/main/java/com/stripe/events/V2CoreHealthApiLatencyResolvedEvent.java
index 6ff8c295345..08496296fb3 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthApiLatencyResolvedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthApiLatencyResolvedEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthApiLatencyResolvedEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthApiLatencyResolvedEventNotification.java
index e6a2ce17547..937bb9beaa4 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthApiLatencyResolvedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthApiLatencyResolvedEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthApiLatencyResolvedEventNotification extends EventNotification {
   /** Retrieve the corresponding full event from the Stripe API. */
diff --git a/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropFiringEvent.java b/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropFiringEvent.java
index 073ba132b02..cda1b5566b2 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropFiringEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropFiringEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.time.Instant;
 import java.util.List;
 import lombok.Getter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropFiringEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropFiringEventNotification.java
index f11b4a2664f..9685a112645 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropFiringEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropFiringEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthAuthorizationRateDropFiringEventNotification
     extends EventNotification {
diff --git a/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropResolvedEvent.java b/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropResolvedEvent.java
index 2642523b333..ff95bf1ca54 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropResolvedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropResolvedEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.time.Instant;
 import java.util.List;
 import lombok.Getter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropResolvedEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropResolvedEventNotification.java
index 039715ea350..540b46f55b4 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropResolvedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthAuthorizationRateDropResolvedEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthAuthorizationRateDropResolvedEventNotification
     extends EventNotification {
diff --git a/src/main/java/com/stripe/events/V2CoreHealthEventGenerationFailureResolvedEvent.java b/src/main/java/com/stripe/events/V2CoreHealthEventGenerationFailureResolvedEvent.java
index 070d53b329d..6228077a14c 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthEventGenerationFailureResolvedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthEventGenerationFailureResolvedEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthEventGenerationFailureResolvedEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthEventGenerationFailureResolvedEventNotification.java
index 21db1fb27fc..1056c1680a9 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthEventGenerationFailureResolvedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthEventGenerationFailureResolvedEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthEventGenerationFailureResolvedEventNotification
     extends EventNotification {
diff --git a/src/main/java/com/stripe/events/V2CoreHealthFraudRateIncreasedEvent.java b/src/main/java/com/stripe/events/V2CoreHealthFraudRateIncreasedEvent.java
index a98cc65afde..6ba5b5249b2 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthFraudRateIncreasedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthFraudRateIncreasedEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import com.stripe.v2.Amount;
 import java.time.Instant;
 import lombok.Getter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthFraudRateIncreasedEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthFraudRateIncreasedEventNotification.java
index 89b8c1c8abc..ff966228ed0 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthFraudRateIncreasedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthFraudRateIncreasedEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthFraudRateIncreasedEventNotification extends EventNotification {
   /** Retrieve the corresponding full event from the Stripe API. */
diff --git a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsFiringEvent.java b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsFiringEvent.java
index 1d017c523d8..3bc15bf47d6 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsFiringEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsFiringEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import com.stripe.v2.Amount;
 import java.time.Instant;
 import lombok.Getter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsFiringEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsFiringEventNotification.java
index eeb1e995c11..a517506a773 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsFiringEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsFiringEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthIssuingAuthorizationRequestErrorsFiringEventNotification
     extends EventNotification {
diff --git a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsResolvedEvent.java b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsResolvedEvent.java
index 0cad8b0e37f..fce01ca74c9 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsResolvedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsResolvedEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import com.stripe.v2.Amount;
 import java.time.Instant;
 import lombok.Getter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsResolvedEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsResolvedEventNotification.java
index ca9a97d8400..6da7bff5ac7 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsResolvedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestErrorsResolvedEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthIssuingAuthorizationRequestErrorsResolvedEventNotification
     extends EventNotification {
diff --git a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutFiringEvent.java b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutFiringEvent.java
index e5c5b91e660..3817a4b835d 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutFiringEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutFiringEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import com.stripe.v2.Amount;
 import java.time.Instant;
 import lombok.Getter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutFiringEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutFiringEventNotification.java
index 03825946361..6a7f5965666 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutFiringEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutFiringEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthIssuingAuthorizationRequestTimeoutFiringEventNotification
     extends EventNotification {
diff --git a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutResolvedEvent.java b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutResolvedEvent.java
index 12d780efe09..f374cedcf01 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutResolvedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutResolvedEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import com.stripe.v2.Amount;
 import java.time.Instant;
 import lombok.Getter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutResolvedEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutResolvedEventNotification.java
index 65ba2685d28..af56f14c0bb 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutResolvedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthIssuingAuthorizationRequestTimeoutResolvedEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthIssuingAuthorizationRequestTimeoutResolvedEventNotification
     extends EventNotification {
diff --git a/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorFiringEvent.java b/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorFiringEvent.java
index de32e979595..ec947aace23 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorFiringEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorFiringEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorFiringEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorFiringEventNotification.java
index 44d944ba080..0554255b551 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorFiringEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorFiringEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthPaymentMethodErrorFiringEventNotification extends EventNotification {
   /** Retrieve the corresponding full event from the Stripe API. */
diff --git a/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorResolvedEvent.java b/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorResolvedEvent.java
index 8da88ab1da3..d0ee47824ab 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorResolvedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorResolvedEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorResolvedEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorResolvedEventNotification.java
index 0d9dadb9883..131e82fd5bc 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorResolvedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthPaymentMethodErrorResolvedEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthPaymentMethodErrorResolvedEventNotification
     extends EventNotification {
diff --git a/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropFiringEvent.java b/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropFiringEvent.java
index b97dff249f8..8508d342227 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropFiringEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropFiringEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropFiringEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropFiringEventNotification.java
index 3ce1136d3af..0ed221cf930 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropFiringEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropFiringEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthTrafficVolumeDropFiringEventNotification extends EventNotification {
   /** Retrieve the corresponding full event from the Stripe API. */
diff --git a/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropResolvedEvent.java b/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropResolvedEvent.java
index 833a9a95566..1859a3a4d02 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropResolvedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropResolvedEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropResolvedEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropResolvedEventNotification.java
index 9f82aa0c711..52df673b92c 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropResolvedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthTrafficVolumeDropResolvedEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthTrafficVolumeDropResolvedEventNotification
     extends EventNotification {
diff --git a/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyFiringEvent.java b/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyFiringEvent.java
index f12e6f04c67..4b63d5a9181 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyFiringEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyFiringEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyFiringEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyFiringEventNotification.java
index c59b62eca5d..3783b996f1f 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyFiringEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyFiringEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthWebhookLatencyFiringEventNotification extends EventNotification {
   /** Retrieve the corresponding full event from the Stripe API. */
diff --git a/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyResolvedEvent.java b/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyResolvedEvent.java
index 7c04a8fb30d..6139a471bd8 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyResolvedEvent.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyResolvedEvent.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.google.gson.annotations.SerializedName;
-import com.stripe.model.v2.Event;
+import com.stripe.model.v2.core.Event;
 import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyResolvedEventNotification.java b/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyResolvedEventNotification.java
index fd08a1efe4a..6d3f0a52ac8 100644
--- a/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyResolvedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2CoreHealthWebhookLatencyResolvedEventNotification.java
@@ -2,7 +2,7 @@
 package com.stripe.events;
 
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 
 public final class V2CoreHealthWebhookLatencyResolvedEventNotification extends EventNotification {
   /** Retrieve the corresponding full event from the Stripe API. */
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementAdjustmentCreatedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementAdjustmentCreatedEvent.java
index 07bd8859901..150eedd5758 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementAdjustmentCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementAdjustmentCreatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.Adjustment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementAdjustmentCreatedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementAdjustmentCreatedEventNotification.java
index 0ea6e9e5574..7da6ec144c8 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementAdjustmentCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementAdjustmentCreatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.Adjustment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountCreatedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountCreatedEvent.java
index 89ecbea26d1..627907bd85f 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountCreatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.FinancialAccount;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountCreatedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountCreatedEventNotification.java
index 29b04f53c7d..8806697d5bb 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountCreatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.FinancialAccount;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountUpdatedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountUpdatedEvent.java
index 33edf898615..54512d98645 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountUpdatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.FinancialAccount;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountUpdatedEventNotification.java
index 073e8e54a81..5aa0c841af1 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAccountUpdatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.FinancialAccount;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressActivatedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressActivatedEvent.java
index c4ac42358ef..9630b7427ff 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressActivatedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressActivatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.FinancialAddress;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressActivatedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressActivatedEventNotification.java
index 31ae0273fb8..82a1ebaf9bc 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressActivatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressActivatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.FinancialAddress;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressFailedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressFailedEvent.java
index 240294bb068..c3fc9bae4c8 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressFailedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressFailedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.FinancialAddress;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressFailedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressFailedEventNotification.java
index bf3aa0f19af..7e7edf2dc13 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementFinancialAddressFailedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.FinancialAddress;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferAvailableEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferAvailableEvent.java
index 3047c7bf7fd..a1b713dfe63 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferAvailableEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferAvailableEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.InboundTransfer;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferAvailableEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferAvailableEventNotification.java
index 7e0613a8800..63b2e5a95f5 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferAvailableEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferAvailableEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.InboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitFailedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitFailedEvent.java
index 55644f79660..93ab1513cd3 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitFailedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitFailedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.InboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitFailedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitFailedEventNotification.java
index 954a7595afc..3b7db567c51 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitFailedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.InboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitProcessingEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitProcessingEvent.java
index d87d4304556..a9fb894b3e5 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitProcessingEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitProcessingEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.InboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitProcessingEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitProcessingEventNotification.java
index 0b5ac997bca..8bd92d3fb24 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitProcessingEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitProcessingEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.InboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitQueuedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitQueuedEvent.java
index 5d163fc4f10..3ffae6df37d 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitQueuedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitQueuedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.InboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitQueuedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitQueuedEventNotification.java
index 05fd13e8409..17fd8862e38 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitQueuedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitQueuedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.InboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitReturnedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitReturnedEvent.java
index bd32c9997ba..f60b5dc52dd 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitReturnedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitReturnedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.InboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitReturnedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitReturnedEventNotification.java
index b6ecfe06b8e..8c67878a08a 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitReturnedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitReturnedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.InboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitSucceededEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitSucceededEvent.java
index 8bf2e732179..ab25d123546 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitSucceededEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitSucceededEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.InboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitSucceededEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitSucceededEventNotification.java
index 1c9a3f081c9..a49f3569d0e 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitSucceededEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementInboundTransferBankDebitSucceededEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.InboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCanceledEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCanceledEvent.java
index f5652721144..e7b65c98d65 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCanceledEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.OutboundPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCanceledEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCanceledEventNotification.java
index 65ec57521cf..19d11385b43 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCanceledEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.OutboundPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCreatedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCreatedEvent.java
index 78d681ab75d..e5dbec23647 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCreatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.OutboundPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCreatedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCreatedEventNotification.java
index 4a54ffeebae..7b95b98c7ba 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentCreatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.OutboundPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentFailedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentFailedEvent.java
index 543076b6e71..20152e04b9b 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentFailedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentFailedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.OutboundPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentFailedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentFailedEventNotification.java
index 3286a458c71..029244d06bd 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentFailedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.OutboundPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentPostedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentPostedEvent.java
index d2e2ffffdf2..1a16bcc3811 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentPostedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentPostedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.OutboundPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentPostedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentPostedEventNotification.java
index b60d2aa1d01..00112ab6100 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentPostedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentPostedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.OutboundPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentReturnedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentReturnedEvent.java
index 56f44a37c3f..f55c53910d2 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentReturnedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentReturnedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.OutboundPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentReturnedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentReturnedEventNotification.java
index 00ef67dae2b..189a9bfe2a8 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentReturnedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentReturnedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.OutboundPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentUpdatedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentUpdatedEvent.java
index 399fda693cc..f4ef6a5b663 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentUpdatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.OutboundPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentUpdatedEventNotification.java
index c0b858a1956..d253f05383e 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundPaymentUpdatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.OutboundPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCanceledEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCanceledEvent.java
index 83b4caa79d3..6e8c2b5f274 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCanceledEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.OutboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCanceledEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCanceledEventNotification.java
index 2c04fd3724e..afbb0d3709a 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCanceledEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.OutboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCreatedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCreatedEvent.java
index 10dd840e974..7b9d20695dd 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCreatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.OutboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCreatedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCreatedEventNotification.java
index 5f114d7cb77..f691bf6625e 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferCreatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.OutboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferFailedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferFailedEvent.java
index e50febc0a6e..b19f4ef9b82 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferFailedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferFailedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.OutboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferFailedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferFailedEventNotification.java
index 7bb69333287..e064b528329 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferFailedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.OutboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferPostedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferPostedEvent.java
index 09223087b5e..0882fccb09b 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferPostedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferPostedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.OutboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferPostedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferPostedEventNotification.java
index 61f2b11147f..21fe5917b30 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferPostedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferPostedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.OutboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferReturnedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferReturnedEvent.java
index b2e7562901f..334c83892a6 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferReturnedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferReturnedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.OutboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferReturnedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferReturnedEventNotification.java
index 1e5682041e2..00843dc3b62 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferReturnedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferReturnedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.OutboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferUpdatedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferUpdatedEvent.java
index ad134388a6f..61b98fba91f 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferUpdatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.OutboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferUpdatedEventNotification.java
index e74007aa889..bb9983d3eb4 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementOutboundTransferUpdatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.OutboundTransfer;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementPayoutMethodUpdatedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementPayoutMethodUpdatedEvent.java
index 3204e532be0..6347a0f2d82 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementPayoutMethodUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementPayoutMethodUpdatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.PayoutMethod;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementPayoutMethodUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementPayoutMethodUpdatedEventNotification.java
index 8b571b385e3..b3c72de89f8 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementPayoutMethodUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementPayoutMethodUpdatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.PayoutMethod;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditAvailableEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditAvailableEvent.java
index 844431bb728..74753a9e7e9 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditAvailableEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditAvailableEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.ReceivedCredit;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditAvailableEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditAvailableEventNotification.java
index b116ede1d4a..907b56e9795 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditAvailableEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditAvailableEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.ReceivedCredit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditFailedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditFailedEvent.java
index 83f572e3dcf..9a9986cbc68 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditFailedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditFailedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.ReceivedCredit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditFailedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditFailedEventNotification.java
index 3715ca966d3..a6d1f08bea5 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditFailedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.ReceivedCredit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditReturnedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditReturnedEvent.java
index d6fc3586e29..20a797d08bb 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditReturnedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditReturnedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.ReceivedCredit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditReturnedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditReturnedEventNotification.java
index 36b16347614..37d21bdb578 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditReturnedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditReturnedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.ReceivedCredit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditSucceededEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditSucceededEvent.java
index c30b7123954..9e4032a180a 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditSucceededEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditSucceededEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.ReceivedCredit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditSucceededEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditSucceededEventNotification.java
index 31423c75961..9c498941158 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditSucceededEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedCreditSucceededEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.ReceivedCredit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitCanceledEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitCanceledEvent.java
index e4d2bd9f139..8ecc57c3eae 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitCanceledEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.ReceivedDebit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitCanceledEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitCanceledEventNotification.java
index 0ebb50ac13a..b4d335b12be 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitCanceledEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.ReceivedDebit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitFailedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitFailedEvent.java
index b686d6f66e7..bef4cb5138d 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitFailedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitFailedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.ReceivedDebit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitFailedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitFailedEventNotification.java
index fb41b5494ef..bd0f6928989 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitFailedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.ReceivedDebit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitPendingEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitPendingEvent.java
index 2dc23c0bda7..5912cf9e137 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitPendingEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitPendingEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.ReceivedDebit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitPendingEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitPendingEventNotification.java
index 40a91fef0ef..4b45255530c 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitPendingEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitPendingEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.ReceivedDebit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitSucceededEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitSucceededEvent.java
index d3da8915b91..81fb4806aa0 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitSucceededEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitSucceededEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.ReceivedDebit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitSucceededEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitSucceededEventNotification.java
index 7e67345ee78..a1798880bb2 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitSucceededEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitSucceededEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.ReceivedDebit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitUpdatedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitUpdatedEvent.java
index 47abad46148..c22f6cbbe92 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitUpdatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.ReceivedDebit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitUpdatedEventNotification.java
index bfea1d5cf8a..c89828902d2 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementReceivedDebitUpdatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.ReceivedDebit;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationCreatedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationCreatedEvent.java
index 069d6ac5fe0..af87759138e 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationCreatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.RecipientVerification;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationCreatedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationCreatedEventNotification.java
index 8a5f68db05f..f855bc2720d 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationCreatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.RecipientVerification;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationUpdatedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationUpdatedEvent.java
index d4e60a537bc..dff2f13cc94 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationUpdatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.RecipientVerification;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationUpdatedEventNotification.java
index 788b998fd5b..7f64f4e0aa5 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementRecipientVerificationUpdatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.RecipientVerification;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementTransactionCreatedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementTransactionCreatedEvent.java
index f3460fca31e..cade559a382 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementTransactionCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementTransactionCreatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.Transaction;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementTransactionCreatedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementTransactionCreatedEventNotification.java
index 326c49e9422..f7bb6eaa1b8 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementTransactionCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementTransactionCreatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.Transaction;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementTransactionUpdatedEvent.java b/src/main/java/com/stripe/events/V2MoneyManagementTransactionUpdatedEvent.java
index e974da3f02b..5fcb3770636 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementTransactionUpdatedEvent.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementTransactionUpdatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.moneymanagement.Transaction;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2MoneyManagementTransactionUpdatedEventNotification.java b/src/main/java/com/stripe/events/V2MoneyManagementTransactionUpdatedEventNotification.java
index c7252c61bc0..1524cb276d5 100644
--- a/src/main/java/com/stripe/events/V2MoneyManagementTransactionUpdatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2MoneyManagementTransactionUpdatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.moneymanagement.Transaction;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptFailedEvent.java b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptFailedEvent.java
index 90c1aa77008..58b0db22351 100644
--- a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptFailedEvent.java
+++ b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptFailedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.payments.OffSessionPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptFailedEventNotification.java b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptFailedEventNotification.java
index 1f5d0bae0e9..c7080c00584 100644
--- a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptFailedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.payments.OffSessionPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptStartedEvent.java b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptStartedEvent.java
index 9864372f9f7..5cc91e3a4c5 100644
--- a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptStartedEvent.java
+++ b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptStartedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.payments.OffSessionPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptStartedEventNotification.java b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptStartedEventNotification.java
index 2b1a9c22202..a26c2cfe202 100644
--- a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptStartedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentAuthorizationAttemptStartedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.payments.OffSessionPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCanceledEvent.java b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCanceledEvent.java
index 23fdf2c6eef..79feffb2de8 100644
--- a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCanceledEvent.java
+++ b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCanceledEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.payments.OffSessionPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCanceledEventNotification.java b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCanceledEventNotification.java
index d2d27218d0f..108fa6fbd17 100644
--- a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCanceledEventNotification.java
+++ b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCanceledEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.payments.OffSessionPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCreatedEvent.java b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCreatedEvent.java
index 7e4a282de49..ee422e1456e 100644
--- a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCreatedEvent.java
+++ b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCreatedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.payments.OffSessionPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCreatedEventNotification.java b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCreatedEventNotification.java
index a458e987631..64213704d23 100644
--- a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCreatedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentCreatedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.payments.OffSessionPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentFailedEvent.java b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentFailedEvent.java
index 19194defedf..b93ef0a59cf 100644
--- a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentFailedEvent.java
+++ b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentFailedEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.payments.OffSessionPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentFailedEventNotification.java b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentFailedEventNotification.java
index 64326c604ff..d331638b7e3 100644
--- a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentFailedEventNotification.java
+++ b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentFailedEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.payments.OffSessionPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentRequiresCaptureEvent.java b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentRequiresCaptureEvent.java
new file mode 100644
index 00000000000..cb5fae2b71f
--- /dev/null
+++ b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentRequiresCaptureEvent.java
@@ -0,0 +1,22 @@
+// File generated from our OpenAPI spec
+package com.stripe.events;
+
+import com.google.gson.annotations.SerializedName;
+import com.stripe.exception.StripeException;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.payments.OffSessionPayment;
+import lombok.Getter;
+
+@Getter
+public final class V2PaymentsOffSessionPaymentRequiresCaptureEvent extends Event {
+  @SerializedName("related_object")
+
+  /** Object containing the reference to API resource relevant to the event. */
+  RelatedObject relatedObject;
+
+  /** Retrieves the related object from the API. Make an API request on every call. */
+  public OffSessionPayment fetchRelatedObject() throws StripeException {
+    return (OffSessionPayment) super.fetchRelatedObject(this.relatedObject);
+  }
+}
diff --git a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentRequiresCaptureEventNotification.java b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentRequiresCaptureEventNotification.java
new file mode 100644
index 00000000000..394ed17da57
--- /dev/null
+++ b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentRequiresCaptureEventNotification.java
@@ -0,0 +1,28 @@
+// File generated from our OpenAPI spec
+package com.stripe.events;
+
+import com.google.gson.annotations.SerializedName;
+import com.stripe.exception.StripeException;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
+import com.stripe.model.v2.payments.OffSessionPayment;
+import lombok.Getter;
+
+@Getter
+public final class V2PaymentsOffSessionPaymentRequiresCaptureEventNotification
+    extends EventNotification {
+  @SerializedName("related_object")
+
+  /** Object containing the reference to API resource relevant to the event. */
+  RelatedObject relatedObject;
+
+  /** Retrieves the related object from the API. Make an API request on every call. */
+  public OffSessionPayment fetchRelatedObject() throws StripeException {
+    return (OffSessionPayment) super.fetchRelatedObject(this.relatedObject);
+  }
+  /** Retrieve the corresponding full event from the Stripe API. */
+  @Override
+  public V2PaymentsOffSessionPaymentRequiresCaptureEvent fetchEvent() throws StripeException {
+    return (V2PaymentsOffSessionPaymentRequiresCaptureEvent) super.fetchEvent();
+  }
+}
diff --git a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentSucceededEvent.java b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentSucceededEvent.java
index 0de7e6b2e8b..2fded91b3cc 100644
--- a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentSucceededEvent.java
+++ b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentSucceededEvent.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.model.v2.payments.OffSessionPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentSucceededEventNotification.java b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentSucceededEventNotification.java
index 8d3af017182..4afe990dd3b 100644
--- a/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentSucceededEventNotification.java
+++ b/src/main/java/com/stripe/events/V2PaymentsOffSessionPaymentSucceededEventNotification.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event.RelatedObject;
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.Event.RelatedObject;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.model.v2.payments.OffSessionPayment;
 import lombok.Getter;
 
diff --git a/src/main/java/com/stripe/examples/EventNotificationWebhookHandler.java b/src/main/java/com/stripe/examples/EventNotificationWebhookHandler.java
index d5869d57281..7bc809e4266 100644
--- a/src/main/java/com/stripe/examples/EventNotificationWebhookHandler.java
+++ b/src/main/java/com/stripe/examples/EventNotificationWebhookHandler.java
@@ -1,13 +1,13 @@
 package com.stripe.examples;
 
 import com.stripe.StripeClient;
+import com.stripe.events.UnknownEventNotification;
 import com.stripe.events.V1BillingMeterErrorReportTriggeredEvent;
 import com.stripe.events.V1BillingMeterErrorReportTriggeredEventNotification;
 import com.stripe.exception.StripeException;
 import com.stripe.model.billing.Meter;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.EventNotification;
-import com.stripe.model.v2.UnknownEventNotification;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.EventNotification;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
diff --git a/src/main/java/com/stripe/model/v2/EventDataClassLookup.java b/src/main/java/com/stripe/model/v2/EventDataClassLookup.java
index 88afecf4828..c9d65f443c2 100644
--- a/src/main/java/com/stripe/model/v2/EventDataClassLookup.java
+++ b/src/main/java/com/stripe/model/v2/EventDataClassLookup.java
@@ -2,6 +2,7 @@
 package com.stripe.model.v2;
 
 import com.stripe.model.StripeObject;
+import com.stripe.model.v2.core.Event;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -66,8 +67,6 @@ public final class EventDataClassLookup {
     classLookup.put(
         "financial_address_generated_microdeposits",
         com.stripe.model.v2.FinancialAddressGeneratedMicrodeposits.class);
-    classLookup.put("v2.core.event", com.stripe.model.v2.Event.class);
-    classLookup.put("v2.core.event_destination", com.stripe.model.v2.EventDestination.class);
 
     classLookup.put(
         "financial_connections.account", com.stripe.model.financialconnections.Account.class);
@@ -142,6 +141,8 @@ public final class EventDataClassLookup {
     classLookup.put("v2.core.account_link", com.stripe.model.v2.core.AccountLink.class);
     classLookup.put("v2.core.account_person", com.stripe.model.v2.core.AccountPerson.class);
     classLookup.put("v2.core.claimable_sandbox", com.stripe.model.v2.core.ClaimableSandbox.class);
+    classLookup.put("v2.core.event", com.stripe.model.v2.core.Event.class);
+    classLookup.put("v2.core.event_destination", com.stripe.model.v2.core.EventDestination.class);
 
     classLookup.put(
         "v2.core.vault.gb_bank_account", com.stripe.model.v2.core.vault.GbBankAccount.class);
@@ -928,6 +929,9 @@ public final class EventDataClassLookup {
     eventClassLookup.put(
         "v2.payments.off_session_payment.failed",
         com.stripe.events.V2PaymentsOffSessionPaymentFailedEvent.class);
+    eventClassLookup.put(
+        "v2.payments.off_session_payment.requires_capture",
+        com.stripe.events.V2PaymentsOffSessionPaymentRequiresCaptureEvent.class);
     eventClassLookup.put(
         "v2.payments.off_session_payment.succeeded",
         com.stripe.events.V2PaymentsOffSessionPaymentSucceededEvent.class);
diff --git a/src/main/java/com/stripe/model/v2/EventNotificationClassLookup.java b/src/main/java/com/stripe/model/v2/EventNotificationClassLookup.java
index 7615b39f85d..7768611e580 100644
--- a/src/main/java/com/stripe/model/v2/EventNotificationClassLookup.java
+++ b/src/main/java/com/stripe/model/v2/EventNotificationClassLookup.java
@@ -1,6 +1,7 @@
 // File generated from our OpenAPI spec
 package com.stripe.model.v2;
 
+import com.stripe.model.v2.core.EventNotification;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -874,6 +875,9 @@ public final class EventNotificationClassLookup {
     eventClassLookup.put(
         "v2.payments.off_session_payment.failed",
         com.stripe.events.V2PaymentsOffSessionPaymentFailedEventNotification.class);
+    eventClassLookup.put(
+        "v2.payments.off_session_payment.requires_capture",
+        com.stripe.events.V2PaymentsOffSessionPaymentRequiresCaptureEventNotification.class);
     eventClassLookup.put(
         "v2.payments.off_session_payment.succeeded",
         com.stripe.events.V2PaymentsOffSessionPaymentSucceededEventNotification.class);
diff --git a/src/main/java/com/stripe/model/v2/EventTypeAdapterFactory.java b/src/main/java/com/stripe/model/v2/EventTypeAdapterFactory.java
index d8d56fc567a..343bd810c9e 100644
--- a/src/main/java/com/stripe/model/v2/EventTypeAdapterFactory.java
+++ b/src/main/java/com/stripe/model/v2/EventTypeAdapterFactory.java
@@ -4,6 +4,7 @@
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import com.stripe.model.v2.core.Event;
 import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/main/java/com/stripe/model/v2/Event.java b/src/main/java/com/stripe/model/v2/core/Event.java
similarity index 98%
rename from src/main/java/com/stripe/model/v2/Event.java
rename to src/main/java/com/stripe/model/v2/core/Event.java
index 0e50fbea25c..0001390278c 100644
--- a/src/main/java/com/stripe/model/v2/Event.java
+++ b/src/main/java/com/stripe/model/v2/core/Event.java
@@ -1,5 +1,5 @@
 // File generated from our OpenAPI spec
-package com.stripe.model.v2;
+package com.stripe.model.v2.core;
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.exception.StripeException;
@@ -7,6 +7,7 @@
 import com.stripe.model.StripeActiveObject;
 import com.stripe.model.StripeObject;
 import com.stripe.model.StripeRawJsonObject;
+import com.stripe.model.v2.EventDataClassLookup;
 import com.stripe.net.ApiRequest;
 import com.stripe.net.ApiResource;
 import com.stripe.net.BaseAddress;
diff --git a/src/main/java/com/stripe/model/v2/EventDestination.java b/src/main/java/com/stripe/model/v2/core/EventDestination.java
similarity index 99%
rename from src/main/java/com/stripe/model/v2/EventDestination.java
rename to src/main/java/com/stripe/model/v2/core/EventDestination.java
index 6da9435ba81..0aee20d9e9b 100644
--- a/src/main/java/com/stripe/model/v2/EventDestination.java
+++ b/src/main/java/com/stripe/model/v2/core/EventDestination.java
@@ -1,5 +1,5 @@
 // File generated from our OpenAPI spec
-package com.stripe.model.v2;
+package com.stripe.model.v2.core;
 
 import com.google.gson.annotations.SerializedName;
 import com.stripe.model.HasId;
diff --git a/src/main/java/com/stripe/model/v2/EventNotification.java b/src/main/java/com/stripe/model/v2/core/EventNotification.java
similarity index 95%
rename from src/main/java/com/stripe/model/v2/EventNotification.java
rename to src/main/java/com/stripe/model/v2/core/EventNotification.java
index 796a1ad0eb5..99c99b13fb7 100644
--- a/src/main/java/com/stripe/model/v2/EventNotification.java
+++ b/src/main/java/com/stripe/model/v2/core/EventNotification.java
@@ -1,12 +1,14 @@
-package com.stripe.model.v2;
+package com.stripe.model.v2.core;
 
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
 import com.stripe.StripeClient;
 import com.stripe.StripeContext;
+import com.stripe.events.UnknownEventNotification;
 import com.stripe.exception.StripeException;
 import com.stripe.model.StripeObject;
-import com.stripe.model.v2.Event.RelatedObject;
+import com.stripe.model.v2.EventNotificationClassLookup;
+import com.stripe.model.v2.core.Event.RelatedObject;
 import com.stripe.net.ApiMode;
 import com.stripe.net.ApiResource;
 import com.stripe.net.ApiResource.RequestMethod;
diff --git a/src/main/java/com/stripe/model/v2/payments/OffSessionPayment.java b/src/main/java/com/stripe/model/v2/payments/OffSessionPayment.java
index 594c0caa161..96b5161e84f 100644
--- a/src/main/java/com/stripe/model/v2/payments/OffSessionPayment.java
+++ b/src/main/java/com/stripe/model/v2/payments/OffSessionPayment.java
@@ -17,6 +17,10 @@
 @Setter
 @EqualsAndHashCode(callSuper = false)
 public class OffSessionPayment extends StripeObject implements HasId {
+  /** The amount available to be captured. */
+  @SerializedName("amount_capturable")
+  Amount amountCapturable;
+
   /** Provides industry-specific information about the amount. */
   @SerializedName("amount_details")
   AmountDetails amountDetails;
@@ -33,6 +37,18 @@ public class OffSessionPayment extends StripeObject implements HasId {
   @SerializedName("cadence")
   String cadence;
 
+  /** Details about the capture configuration for the OffSessionPayment. */
+  @SerializedName("capture")
+  Capture capture;
+
+  /**
+   * Whether the OffSessionPayment should be captured automatically or manually.
+   *
+   * <p>One of {@code automatic}, or {@code manual}.
+   */
+  @SerializedName("capture_method")
+  String captureMethod;
+
   /** ID of the owning compartment. */
   @SerializedName("compartment_id")
   String compartmentId;
@@ -250,6 +266,24 @@ public static class Tax extends StripeObject {
     }
   }
 
+  /** Details about the capture configuration for the OffSessionPayment. */
+  @Getter
+  @Setter
+  @EqualsAndHashCode(callSuper = false)
+  public static class Capture extends StripeObject {
+    /** The timestamp when this payment is no longer eligible to be captured. */
+    @SerializedName("capture_before")
+    Instant captureBefore;
+
+    /**
+     * The method to use to capture the payment.
+     *
+     * <p>One of {@code automatic}, or {@code manual}.
+     */
+    @SerializedName("capture_method")
+    String captureMethod;
+  }
+
   /** Details about the payments orchestration configuration. */
   @Getter
   @Setter
diff --git a/src/main/java/com/stripe/param/v2/payments/OffSessionPaymentCaptureParams.java b/src/main/java/com/stripe/param/v2/payments/OffSessionPaymentCaptureParams.java
new file mode 100644
index 00000000000..b85572b0c82
--- /dev/null
+++ b/src/main/java/com/stripe/param/v2/payments/OffSessionPaymentCaptureParams.java
@@ -0,0 +1,302 @@
+// File generated from our OpenAPI spec
+package com.stripe.param.v2.payments;
+
+import com.google.gson.annotations.SerializedName;
+import com.stripe.net.ApiRequestParams;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+@Getter
+@EqualsAndHashCode(callSuper = false)
+public class OffSessionPaymentCaptureParams extends ApiRequestParams {
+  /** <strong>Required.</strong> The amount to capture. */
+  @SerializedName("amount_to_capture")
+  Long amountToCapture;
+
+  /**
+   * Map of extra parameters for custom features not available in this client library. The content
+   * in this map is not serialized under this field's {@code @SerializedName} value. Instead, each
+   * key/value pair is serialized as if the key is a root-level field (serialized) name in this
+   * param object. Effectively, this map is flattened to its parent instance.
+   */
+  @SerializedName(ApiRequestParams.EXTRA_PARAMS_KEY)
+  Map<String, Object> extraParams;
+
+  /**
+   * <strong>Required.</strong> Set of <a href="https://docs.corp.stripe.com/api/metadata">key-value
+   * pairs</a> that you can attach to an object. This can be useful for storing additional
+   * information about the object in a structured format. Learn more about <a
+   * href="https://docs.corp.stripe.com/payments/payment-intents#storing-information-in-metadata">storing
+   * information in metadata</a>.
+   */
+  @SerializedName("metadata")
+  Map<String, String> metadata;
+
+  /**
+   * Text that appears on the customer’s statement as the statement descriptor for a non-card
+   * charge. This value overrides the account’s default statement descriptor. For information about
+   * requirements, including the 22-character limit, see the <a
+   * href="https://docs.stripe.com/get-started/account/statement-descriptors">Statement Descriptor
+   * docs</a>.
+   */
+  @SerializedName("statement_descriptor")
+  String statementDescriptor;
+
+  /**
+   * Provides information about a card charge. Concatenated to the account’s <a
+   * href="https://docs.stripe.com/get-started/account/statement-descriptors#static">statement
+   * descriptor prefix</a> to form the complete statement descriptor that appears on the customer’s
+   * statement.
+   */
+  @SerializedName("statement_descriptor_suffix")
+  String statementDescriptorSuffix;
+
+  /**
+   * The data that automatically creates a Transfer after the payment finalizes. Learn more about
+   * the use case for <a href="https://docs.corp.stripe.com/payments/connected-accounts">connected
+   * accounts</a>.
+   */
+  @SerializedName("transfer_data")
+  TransferData transferData;
+
+  private OffSessionPaymentCaptureParams(
+      Long amountToCapture,
+      Map<String, Object> extraParams,
+      Map<String, String> metadata,
+      String statementDescriptor,
+      String statementDescriptorSuffix,
+      TransferData transferData) {
+    this.amountToCapture = amountToCapture;
+    this.extraParams = extraParams;
+    this.metadata = metadata;
+    this.statementDescriptor = statementDescriptor;
+    this.statementDescriptorSuffix = statementDescriptorSuffix;
+    this.transferData = transferData;
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  public static class Builder {
+    private Long amountToCapture;
+
+    private Map<String, Object> extraParams;
+
+    private Map<String, String> metadata;
+
+    private String statementDescriptor;
+
+    private String statementDescriptorSuffix;
+
+    private TransferData transferData;
+
+    /** Finalize and obtain parameter instance from this builder. */
+    public OffSessionPaymentCaptureParams build() {
+      return new OffSessionPaymentCaptureParams(
+          this.amountToCapture,
+          this.extraParams,
+          this.metadata,
+          this.statementDescriptor,
+          this.statementDescriptorSuffix,
+          this.transferData);
+    }
+
+    /** <strong>Required.</strong> The amount to capture. */
+    public Builder setAmountToCapture(Long amountToCapture) {
+      this.amountToCapture = amountToCapture;
+      return this;
+    }
+
+    /**
+     * Add a key/value pair to `extraParams` map. A map is initialized for the first `put/putAll`
+     * call, and subsequent calls add additional key/value pairs to the original map. See {@link
+     * OffSessionPaymentCaptureParams#extraParams} for the field documentation.
+     */
+    public Builder putExtraParam(String key, Object value) {
+      if (this.extraParams == null) {
+        this.extraParams = new HashMap<>();
+      }
+      this.extraParams.put(key, value);
+      return this;
+    }
+
+    /**
+     * Add all map key/value pairs to `extraParams` map. A map is initialized for the first
+     * `put/putAll` call, and subsequent calls add additional key/value pairs to the original map.
+     * See {@link OffSessionPaymentCaptureParams#extraParams} for the field documentation.
+     */
+    public Builder putAllExtraParam(Map<String, Object> map) {
+      if (this.extraParams == null) {
+        this.extraParams = new HashMap<>();
+      }
+      this.extraParams.putAll(map);
+      return this;
+    }
+
+    /**
+     * Add a key/value pair to `metadata` map. A map is initialized for the first `put/putAll` call,
+     * and subsequent calls add additional key/value pairs to the original map. See {@link
+     * OffSessionPaymentCaptureParams#metadata} for the field documentation.
+     */
+    public Builder putMetadata(String key, String value) {
+      if (this.metadata == null) {
+        this.metadata = new HashMap<>();
+      }
+      this.metadata.put(key, value);
+      return this;
+    }
+
+    /**
+     * Add all map key/value pairs to `metadata` map. A map is initialized for the first
+     * `put/putAll` call, and subsequent calls add additional key/value pairs to the original map.
+     * See {@link OffSessionPaymentCaptureParams#metadata} for the field documentation.
+     */
+    public Builder putAllMetadata(Map<String, String> map) {
+      if (this.metadata == null) {
+        this.metadata = new HashMap<>();
+      }
+      this.metadata.putAll(map);
+      return this;
+    }
+
+    /**
+     * Text that appears on the customer’s statement as the statement descriptor for a non-card
+     * charge. This value overrides the account’s default statement descriptor. For information
+     * about requirements, including the 22-character limit, see the <a
+     * href="https://docs.stripe.com/get-started/account/statement-descriptors">Statement Descriptor
+     * docs</a>.
+     */
+    public Builder setStatementDescriptor(String statementDescriptor) {
+      this.statementDescriptor = statementDescriptor;
+      return this;
+    }
+
+    /**
+     * Provides information about a card charge. Concatenated to the account’s <a
+     * href="https://docs.stripe.com/get-started/account/statement-descriptors#static">statement
+     * descriptor prefix</a> to form the complete statement descriptor that appears on the
+     * customer’s statement.
+     */
+    public Builder setStatementDescriptorSuffix(String statementDescriptorSuffix) {
+      this.statementDescriptorSuffix = statementDescriptorSuffix;
+      return this;
+    }
+
+    /**
+     * The data that automatically creates a Transfer after the payment finalizes. Learn more about
+     * the use case for <a href="https://docs.corp.stripe.com/payments/connected-accounts">connected
+     * accounts</a>.
+     */
+    public Builder setTransferData(OffSessionPaymentCaptureParams.TransferData transferData) {
+      this.transferData = transferData;
+      return this;
+    }
+  }
+
+  @Getter
+  @EqualsAndHashCode(callSuper = false)
+  public static class TransferData {
+    /**
+     * The amount transferred to the destination account. This transfer will occur automatically
+     * after the payment succeeds. If no amount is specified, by default the entire payment amount
+     * is transferred to the destination account. The amount must be less than or equal to the <a
+     * href="https://docs.corp.stripe.com/api/v2/off-session-payments/object?api-version=2025-05-28.preview#v2_off_session_payment_object-amount_requested">amount_requested</a>,
+     * and must be a positive integer representing how much to transfer in the smallest currency
+     * unit (e.g., 100 cents to charge $1.00).
+     */
+    @SerializedName("amount")
+    Long amount;
+
+    /**
+     * <strong>Required.</strong> The account (if any) that the payment is attributed to for tax
+     * reporting, and where funds from the payment are transferred to after payment success.
+     */
+    @SerializedName("destination")
+    String destination;
+
+    /**
+     * Map of extra parameters for custom features not available in this client library. The content
+     * in this map is not serialized under this field's {@code @SerializedName} value. Instead, each
+     * key/value pair is serialized as if the key is a root-level field (serialized) name in this
+     * param object. Effectively, this map is flattened to its parent instance.
+     */
+    @SerializedName(ApiRequestParams.EXTRA_PARAMS_KEY)
+    Map<String, Object> extraParams;
+
+    private TransferData(Long amount, String destination, Map<String, Object> extraParams) {
+      this.amount = amount;
+      this.destination = destination;
+      this.extraParams = extraParams;
+    }
+
+    public static Builder builder() {
+      return new Builder();
+    }
+
+    public static class Builder {
+      private Long amount;
+
+      private String destination;
+
+      private Map<String, Object> extraParams;
+
+      /** Finalize and obtain parameter instance from this builder. */
+      public OffSessionPaymentCaptureParams.TransferData build() {
+        return new OffSessionPaymentCaptureParams.TransferData(
+            this.amount, this.destination, this.extraParams);
+      }
+
+      /**
+       * The amount transferred to the destination account. This transfer will occur automatically
+       * after the payment succeeds. If no amount is specified, by default the entire payment amount
+       * is transferred to the destination account. The amount must be less than or equal to the <a
+       * href="https://docs.corp.stripe.com/api/v2/off-session-payments/object?api-version=2025-05-28.preview#v2_off_session_payment_object-amount_requested">amount_requested</a>,
+       * and must be a positive integer representing how much to transfer in the smallest currency
+       * unit (e.g., 100 cents to charge $1.00).
+       */
+      public Builder setAmount(Long amount) {
+        this.amount = amount;
+        return this;
+      }
+
+      /**
+       * <strong>Required.</strong> The account (if any) that the payment is attributed to for tax
+       * reporting, and where funds from the payment are transferred to after payment success.
+       */
+      public Builder setDestination(String destination) {
+        this.destination = destination;
+        return this;
+      }
+
+      /**
+       * Add a key/value pair to `extraParams` map. A map is initialized for the first `put/putAll`
+       * call, and subsequent calls add additional key/value pairs to the original map. See {@link
+       * OffSessionPaymentCaptureParams.TransferData#extraParams} for the field documentation.
+       */
+      public Builder putExtraParam(String key, Object value) {
+        if (this.extraParams == null) {
+          this.extraParams = new HashMap<>();
+        }
+        this.extraParams.put(key, value);
+        return this;
+      }
+
+      /**
+       * Add all map key/value pairs to `extraParams` map. A map is initialized for the first
+       * `put/putAll` call, and subsequent calls add additional key/value pairs to the original map.
+       * See {@link OffSessionPaymentCaptureParams.TransferData#extraParams} for the field
+       * documentation.
+       */
+      public Builder putAllExtraParam(Map<String, Object> map) {
+        if (this.extraParams == null) {
+          this.extraParams = new HashMap<>();
+        }
+        this.extraParams.putAll(map);
+        return this;
+      }
+    }
+  }
+}
diff --git a/src/main/java/com/stripe/param/v2/payments/OffSessionPaymentCreateParams.java b/src/main/java/com/stripe/param/v2/payments/OffSessionPaymentCreateParams.java
index 0bc6f32556f..594d724bfd7 100644
--- a/src/main/java/com/stripe/param/v2/payments/OffSessionPaymentCreateParams.java
+++ b/src/main/java/com/stripe/param/v2/payments/OffSessionPaymentCreateParams.java
@@ -4,7 +4,6 @@
 import com.google.gson.annotations.SerializedName;
 import com.stripe.net.ApiRequestParams;
 import com.stripe.v2.Amount;
-import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -27,6 +26,14 @@ public class OffSessionPaymentCreateParams extends ApiRequestParams {
   @SerializedName("cadence")
   Cadence cadence;
 
+  /** Details about the capture configuration for the OffSessionPayment. */
+  @SerializedName("capture")
+  Capture capture;
+
+  /** Whether the OffSessionPayment should be captured automatically or manually. */
+  @SerializedName("capture_method")
+  CaptureMethod captureMethod;
+
   /** <strong>Required.</strong> ID of the Customer to which this OffSessionPayment belongs. */
   @SerializedName("customer")
   String customer;
@@ -40,10 +47,6 @@ public class OffSessionPaymentCreateParams extends ApiRequestParams {
   @SerializedName(ApiRequestParams.EXTRA_PARAMS_KEY)
   Map<String, Object> extraParams;
 
-  /** This hash contains details about the Mandate to create. */
-  @SerializedName("mandate_data")
-  MandateData mandateData;
-
   /**
    * <strong>Required.</strong> Set of <a href="https://docs.corp.stripe.com/api/metadata">key-value
    * pairs</a> that you can attach to an object. This can be useful for storing additional
@@ -109,9 +112,10 @@ private OffSessionPaymentCreateParams(
       Amount amount,
       AmountDetails amountDetails,
       Cadence cadence,
+      Capture capture,
+      CaptureMethod captureMethod,
       String customer,
       Map<String, Object> extraParams,
-      MandateData mandateData,
       Map<String, String> metadata,
       String onBehalfOf,
       String paymentMethod,
@@ -125,9 +129,10 @@ private OffSessionPaymentCreateParams(
     this.amount = amount;
     this.amountDetails = amountDetails;
     this.cadence = cadence;
+    this.capture = capture;
+    this.captureMethod = captureMethod;
     this.customer = customer;
     this.extraParams = extraParams;
-    this.mandateData = mandateData;
     this.metadata = metadata;
     this.onBehalfOf = onBehalfOf;
     this.paymentMethod = paymentMethod;
@@ -151,12 +156,14 @@ public static class Builder {
 
     private Cadence cadence;
 
+    private Capture capture;
+
+    private CaptureMethod captureMethod;
+
     private String customer;
 
     private Map<String, Object> extraParams;
 
-    private MandateData mandateData;
-
     private Map<String, String> metadata;
 
     private String onBehalfOf;
@@ -183,9 +190,10 @@ public OffSessionPaymentCreateParams build() {
           this.amount,
           this.amountDetails,
           this.cadence,
+          this.capture,
+          this.captureMethod,
           this.customer,
           this.extraParams,
-          this.mandateData,
           this.metadata,
           this.onBehalfOf,
           this.paymentMethod,
@@ -216,6 +224,18 @@ public Builder setCadence(OffSessionPaymentCreateParams.Cadence cadence) {
       return this;
     }
 
+    /** Details about the capture configuration for the OffSessionPayment. */
+    public Builder setCapture(OffSessionPaymentCreateParams.Capture capture) {
+      this.capture = capture;
+      return this;
+    }
+
+    /** Whether the OffSessionPayment should be captured automatically or manually. */
+    public Builder setCaptureMethod(OffSessionPaymentCreateParams.CaptureMethod captureMethod) {
+      this.captureMethod = captureMethod;
+      return this;
+    }
+
     /** <strong>Required.</strong> ID of the Customer to which this OffSessionPayment belongs. */
     public Builder setCustomer(String customer) {
       this.customer = customer;
@@ -248,12 +268,6 @@ public Builder putAllExtraParam(Map<String, Object> map) {
       return this;
     }
 
-    /** This hash contains details about the Mandate to create. */
-    public Builder setMandateData(OffSessionPaymentCreateParams.MandateData mandateData) {
-      this.mandateData = mandateData;
-      return this;
-    }
-
     /**
      * Add a key/value pair to `metadata` map. A map is initialized for the first `put/putAll` call,
      * and subsequent calls add additional key/value pairs to the original map. See {@link
@@ -890,13 +904,10 @@ public Builder setTotalTaxAmount(Long totalTaxAmount) {
 
   @Getter
   @EqualsAndHashCode(callSuper = false)
-  public static class MandateData {
-    /**
-     * <strong>Required.</strong> This hash contains details about the customer acceptance of the
-     * Mandate.
-     */
-    @SerializedName("customer_acceptance")
-    CustomerAcceptance customerAcceptance;
+  public static class Capture {
+    /** <strong>Required.</strong> The method to use to capture the payment. */
+    @SerializedName("capture_method")
+    CaptureMethod captureMethod;
 
     /**
      * Map of extra parameters for custom features not available in this client library. The content
@@ -907,8 +918,8 @@ public static class MandateData {
     @SerializedName(ApiRequestParams.EXTRA_PARAMS_KEY)
     Map<String, Object> extraParams;
 
-    private MandateData(CustomerAcceptance customerAcceptance, Map<String, Object> extraParams) {
-      this.customerAcceptance = customerAcceptance;
+    private Capture(CaptureMethod captureMethod, Map<String, Object> extraParams) {
+      this.captureMethod = captureMethod;
       this.extraParams = extraParams;
     }
 
@@ -917,30 +928,26 @@ public static Builder builder() {
     }
 
     public static class Builder {
-      private CustomerAcceptance customerAcceptance;
+      private CaptureMethod captureMethod;
 
       private Map<String, Object> extraParams;
 
       /** Finalize and obtain parameter instance from this builder. */
-      public OffSessionPaymentCreateParams.MandateData build() {
-        return new OffSessionPaymentCreateParams.MandateData(
-            this.customerAcceptance, this.extraParams);
+      public OffSessionPaymentCreateParams.Capture build() {
+        return new OffSessionPaymentCreateParams.Capture(this.captureMethod, this.extraParams);
       }
 
-      /**
-       * <strong>Required.</strong> This hash contains details about the customer acceptance of the
-       * Mandate.
-       */
-      public Builder setCustomerAcceptance(
-          OffSessionPaymentCreateParams.MandateData.CustomerAcceptance customerAcceptance) {
-        this.customerAcceptance = customerAcceptance;
+      /** <strong>Required.</strong> The method to use to capture the payment. */
+      public Builder setCaptureMethod(
+          OffSessionPaymentCreateParams.Capture.CaptureMethod captureMethod) {
+        this.captureMethod = captureMethod;
         return this;
       }
 
       /**
        * Add a key/value pair to `extraParams` map. A map is initialized for the first `put/putAll`
        * call, and subsequent calls add additional key/value pairs to the original map. See {@link
-       * OffSessionPaymentCreateParams.MandateData#extraParams} for the field documentation.
+       * OffSessionPaymentCreateParams.Capture#extraParams} for the field documentation.
        */
       public Builder putExtraParam(String key, Object value) {
         if (this.extraParams == null) {
@@ -953,8 +960,7 @@ public Builder putExtraParam(String key, Object value) {
       /**
        * Add all map key/value pairs to `extraParams` map. A map is initialized for the first
        * `put/putAll` call, and subsequent calls add additional key/value pairs to the original map.
-       * See {@link OffSessionPaymentCreateParams.MandateData#extraParams} for the field
-       * documentation.
+       * See {@link OffSessionPaymentCreateParams.Capture#extraParams} for the field documentation.
        */
       public Builder putAllExtraParam(Map<String, Object> map) {
         if (this.extraParams == null) {
@@ -965,107 +971,18 @@ public Builder putAllExtraParam(Map<String, Object> map) {
       }
     }
 
-    @Getter
-    @EqualsAndHashCode(callSuper = false)
-    public static class CustomerAcceptance {
-      /** The time at which the customer accepted the Mandate. */
-      @SerializedName("accepted_at")
-      Instant acceptedAt;
-
-      /**
-       * Map of extra parameters for custom features not available in this client library. The
-       * content in this map is not serialized under this field's {@code @SerializedName} value.
-       * Instead, each key/value pair is serialized as if the key is a root-level field (serialized)
-       * name in this param object. Effectively, this map is flattened to its parent instance.
-       */
-      @SerializedName(ApiRequestParams.EXTRA_PARAMS_KEY)
-      Map<String, Object> extraParams;
-
-      /**
-       * <strong>Required.</strong> The type of customer acceptance information included with the
-       * Mandate.
-       */
-      @SerializedName("type")
-      Type type;
-
-      private CustomerAcceptance(Instant acceptedAt, Map<String, Object> extraParams, Type type) {
-        this.acceptedAt = acceptedAt;
-        this.extraParams = extraParams;
-        this.type = type;
-      }
-
-      public static Builder builder() {
-        return new Builder();
-      }
-
-      public static class Builder {
-        private Instant acceptedAt;
-
-        private Map<String, Object> extraParams;
+    public enum CaptureMethod implements ApiRequestParams.EnumParam {
+      @SerializedName("automatic")
+      AUTOMATIC("automatic"),
 
-        private Type type;
-
-        /** Finalize and obtain parameter instance from this builder. */
-        public OffSessionPaymentCreateParams.MandateData.CustomerAcceptance build() {
-          return new OffSessionPaymentCreateParams.MandateData.CustomerAcceptance(
-              this.acceptedAt, this.extraParams, this.type);
-        }
+      @SerializedName("manual")
+      MANUAL("manual");
 
-        /** The time at which the customer accepted the Mandate. */
-        public Builder setAcceptedAt(Instant acceptedAt) {
-          this.acceptedAt = acceptedAt;
-          return this;
-        }
-
-        /**
-         * Add a key/value pair to `extraParams` map. A map is initialized for the first
-         * `put/putAll` call, and subsequent calls add additional key/value pairs to the original
-         * map. See {@link OffSessionPaymentCreateParams.MandateData.CustomerAcceptance#extraParams}
-         * for the field documentation.
-         */
-        public Builder putExtraParam(String key, Object value) {
-          if (this.extraParams == null) {
-            this.extraParams = new HashMap<>();
-          }
-          this.extraParams.put(key, value);
-          return this;
-        }
-
-        /**
-         * Add all map key/value pairs to `extraParams` map. A map is initialized for the first
-         * `put/putAll` call, and subsequent calls add additional key/value pairs to the original
-         * map. See {@link OffSessionPaymentCreateParams.MandateData.CustomerAcceptance#extraParams}
-         * for the field documentation.
-         */
-        public Builder putAllExtraParam(Map<String, Object> map) {
-          if (this.extraParams == null) {
-            this.extraParams = new HashMap<>();
-          }
-          this.extraParams.putAll(map);
-          return this;
-        }
-
-        /**
-         * <strong>Required.</strong> The type of customer acceptance information included with the
-         * Mandate.
-         */
-        public Builder setType(
-            OffSessionPaymentCreateParams.MandateData.CustomerAcceptance.Type type) {
-          this.type = type;
-          return this;
-        }
-      }
-
-      public enum Type implements ApiRequestParams.EnumParam {
-        @SerializedName("offline")
-        OFFLINE("offline");
-
-        @Getter(onMethod_ = {@Override})
-        private final String value;
+      @Getter(onMethod_ = {@Override})
+      private final String value;
 
-        Type(String value) {
-          this.value = value;
-        }
+      CaptureMethod(String value) {
+        this.value = value;
       }
     }
   }
@@ -1542,4 +1459,19 @@ public enum Cadence implements ApiRequestParams.EnumParam {
       this.value = value;
     }
   }
+
+  public enum CaptureMethod implements ApiRequestParams.EnumParam {
+    @SerializedName("automatic")
+    AUTOMATIC("automatic"),
+
+    @SerializedName("manual")
+    MANUAL("manual");
+
+    @Getter(onMethod_ = {@Override})
+    private final String value;
+
+    CaptureMethod(String value) {
+      this.value = value;
+    }
+  }
 }
diff --git a/src/main/java/com/stripe/service/v2/core/EventDestinationService.java b/src/main/java/com/stripe/service/v2/core/EventDestinationService.java
index 39593093d9b..db78a3f2f36 100644
--- a/src/main/java/com/stripe/service/v2/core/EventDestinationService.java
+++ b/src/main/java/com/stripe/service/v2/core/EventDestinationService.java
@@ -4,9 +4,9 @@
 import com.google.gson.reflect.TypeToken;
 import com.stripe.exception.StripeException;
 import com.stripe.model.v2.DeletedObject;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.EventDestination;
 import com.stripe.model.v2.StripeCollection;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.EventDestination;
 import com.stripe.net.ApiRequest;
 import com.stripe.net.ApiRequestParams;
 import com.stripe.net.ApiResource;
diff --git a/src/main/java/com/stripe/service/v2/core/EventService.java b/src/main/java/com/stripe/service/v2/core/EventService.java
index 5732a916f2f..6a2cae51bbf 100644
--- a/src/main/java/com/stripe/service/v2/core/EventService.java
+++ b/src/main/java/com/stripe/service/v2/core/EventService.java
@@ -3,8 +3,8 @@
 
 import com.google.gson.reflect.TypeToken;
 import com.stripe.exception.StripeException;
-import com.stripe.model.v2.Event;
 import com.stripe.model.v2.StripeCollection;
+import com.stripe.model.v2.core.Event;
 import com.stripe.net.ApiRequest;
 import com.stripe.net.ApiRequestParams;
 import com.stripe.net.ApiResource;
diff --git a/src/main/java/com/stripe/service/v2/payments/OffSessionPaymentService.java b/src/main/java/com/stripe/service/v2/payments/OffSessionPaymentService.java
index 0069742e4cc..52d5dad7277 100644
--- a/src/main/java/com/stripe/service/v2/payments/OffSessionPaymentService.java
+++ b/src/main/java/com/stripe/service/v2/payments/OffSessionPaymentService.java
@@ -12,6 +12,7 @@
 import com.stripe.net.BaseAddress;
 import com.stripe.net.RequestOptions;
 import com.stripe.net.StripeResponseGetter;
+import com.stripe.param.v2.payments.OffSessionPaymentCaptureParams;
 import com.stripe.param.v2.payments.OffSessionPaymentCreateParams;
 import com.stripe.param.v2.payments.OffSessionPaymentListParams;
 
@@ -87,4 +88,24 @@ public OffSessionPayment cancel(String id, RequestOptions options) throws Stripe
         new ApiRequest(BaseAddress.API, ApiResource.RequestMethod.POST, path, null, options);
     return this.request(request, OffSessionPayment.class);
   }
+  /** Captures an OffSessionPayment that has previously been created. */
+  public OffSessionPayment capture(String id, OffSessionPaymentCaptureParams params)
+      throws StripeException {
+    return capture(id, params, (RequestOptions) null);
+  }
+  /** Captures an OffSessionPayment that has previously been created. */
+  public OffSessionPayment capture(
+      String id, OffSessionPaymentCaptureParams params, RequestOptions options)
+      throws StripeException {
+    String path =
+        String.format("/v2/payments/off_session_payments/%s/capture", ApiResource.urlEncodeId(id));
+    ApiRequest request =
+        new ApiRequest(
+            BaseAddress.API,
+            ApiResource.RequestMethod.POST,
+            path,
+            ApiRequestParams.paramsToMap(params),
+            options);
+    return this.request(request, OffSessionPayment.class);
+  }
 }
diff --git a/src/test/java/com/stripe/StripeClientTest.java b/src/test/java/com/stripe/StripeClientTest.java
index 4a95f3eaec2..7a644d2e8a6 100644
--- a/src/test/java/com/stripe/StripeClientTest.java
+++ b/src/test/java/com/stripe/StripeClientTest.java
@@ -10,6 +10,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
+import com.stripe.events.UnknownEventNotification;
 import com.stripe.events.V1BillingMeterErrorReportTriggeredEvent;
 import com.stripe.events.V1BillingMeterErrorReportTriggeredEventNotification;
 import com.stripe.events.V1BillingMeterNoMeterFoundEventNotification;
@@ -17,9 +18,8 @@
 import com.stripe.exception.StripeException;
 import com.stripe.model.billing.Meter;
 import com.stripe.model.terminal.Reader;
-import com.stripe.model.v2.Event;
-import com.stripe.model.v2.EventNotification;
-import com.stripe.model.v2.UnknownEventNotification;
+import com.stripe.model.v2.core.Event;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.net.*;
 import com.stripe.net.ApiResource.RequestMethod;
 import java.lang.reflect.Type;
diff --git a/src/test/java/com/stripe/StripeContextIntegrationTest.java b/src/test/java/com/stripe/StripeContextIntegrationTest.java
index a6ed855e9a3..9d12dd3f3c0 100644
--- a/src/test/java/com/stripe/StripeContextIntegrationTest.java
+++ b/src/test/java/com/stripe/StripeContextIntegrationTest.java
@@ -2,7 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import com.stripe.model.v2.EventNotification;
+import com.stripe.model.v2.core.EventNotification;
 import com.stripe.net.RawRequestOptions;
 import com.stripe.net.RequestOptions;
 import java.util.Arrays;
diff --git a/src/test/java/com/stripe/functional/GeneratedExamples.java b/src/test/java/com/stripe/functional/GeneratedExamples.java
index d4a6ab60486..d90d7528726 100644
--- a/src/test/java/com/stripe/functional/GeneratedExamples.java
+++ b/src/test/java/com/stripe/functional/GeneratedExamples.java
@@ -3207,11 +3207,11 @@ public void testCoreEventsGetServices() throws StripeException {
         "/v2/core/events/ll_123",
         null,
         null,
-        com.stripe.model.v2.Event.class,
+        com.stripe.model.v2.core.Event.class,
         "{\"changes\":{\"key\":{}},\"context\":\"context\",\"created\":\"1970-01-12T21:42:34.472Z\",\"id\":\"obj_123\",\"object\":\"v2.core.event\",\"reason\":{\"type\":\"request\",\"request\":{\"id\":\"obj_123\",\"idempotency_key\":\"idempotency_key\"}},\"type\":\"type\",\"v1_event_id\":\"v1_event_id\",\"livemode\":true}");
     StripeClient client = new StripeClient(networkSpy);
 
-    com.stripe.model.v2.Event event = client.v2().core().events().retrieve("ll_123");
+    com.stripe.model.v2.core.Event event = client.v2().core().events().retrieve("ll_123");
     assertNotNull(event);
     verifyRequest(
         BaseAddress.API, ApiResource.RequestMethod.GET, "/v2/core/events/ll_123", null, null);
@@ -5118,9 +5118,7 @@ public void testCustomersSourcesPostServices() throws StripeException {
     StripeClient client = new StripeClient(networkSpy);
 
     com.stripe.param.CustomerPaymentSourceUpdateParams params =
-        com.stripe.param.CustomerPaymentSourceUpdateParams.builder()
-            .setAccountHolderName("Kamil")
-            .build();
+        com.stripe.param.CustomerPaymentSourceUpdateParams.builder().setName("Kamil").build();
 
     com.stripe.model.PaymentSource paymentSource =
         client.v1().customers().paymentSources().update("cus_123", "card_123", params);
@@ -5138,9 +5136,7 @@ public void testCustomersSourcesPostServicesNonNamespaced() throws StripeExcepti
     StripeClient client = new StripeClient(networkSpy);
 
     com.stripe.param.CustomerPaymentSourceUpdateParams params =
-        com.stripe.param.CustomerPaymentSourceUpdateParams.builder()
-            .setAccountHolderName("Kamil")
-            .build();
+        com.stripe.param.CustomerPaymentSourceUpdateParams.builder().setName("Kamil").build();
 
     com.stripe.model.PaymentSource paymentSource =
         client.customers().paymentSources().update("cus_123", "card_123", params);
@@ -27141,14 +27137,14 @@ public void testV2CoreEventGetServices() throws StripeException {
         null,
         null,
         new TypeToken<
-            com.stripe.model.v2.StripeCollection<com.stripe.model.v2.Event>>() {}.getType(),
+            com.stripe.model.v2.StripeCollection<com.stripe.model.v2.core.Event>>() {}.getType(),
         "{\"data\":[{\"created\":\"1970-01-12T21:42:34.472Z\",\"id\":\"obj_123\",\"object\":\"v2.core.event\",\"type\":\"type\",\"livemode\":true}],\"next_page_url\":null,\"previous_page_url\":null}");
     StripeClient client = new StripeClient(networkSpy);
 
     com.stripe.param.v2.core.EventListParams params =
         com.stripe.param.v2.core.EventListParams.builder().setObjectId("object_id").build();
 
-    com.stripe.model.v2.StripeCollection<com.stripe.model.v2.Event> stripeCollection =
+    com.stripe.model.v2.StripeCollection<com.stripe.model.v2.core.Event> stripeCollection =
         client.v2().core().events().list(params);
     assertNotNull(stripeCollection);
     verifyRequest(
@@ -27163,11 +27159,11 @@ public void testV2CoreEventGet2Services() throws StripeException {
         "/v2/core/events/id_123",
         null,
         null,
-        com.stripe.model.v2.Event.class,
+        com.stripe.model.v2.core.Event.class,
         "{\"created\":\"1970-01-12T21:42:34.472Z\",\"id\":\"obj_123\",\"object\":\"v2.core.event\",\"type\":\"type\",\"livemode\":true}");
     StripeClient client = new StripeClient(networkSpy);
 
-    com.stripe.model.v2.Event event = client.v2().core().events().retrieve("id_123");
+    com.stripe.model.v2.core.Event event = client.v2().core().events().retrieve("id_123");
     assertNotNull(event);
     verifyRequest(
         BaseAddress.API, ApiResource.RequestMethod.GET, "/v2/core/events/id_123", null, null);
@@ -27183,15 +27179,15 @@ public void testV2CoreEventDestinationGetServices() throws StripeException {
         null,
         new TypeToken<
             com.stripe.model.v2.StripeCollection<
-                com.stripe.model.v2.EventDestination>>() {}.getType(),
+                com.stripe.model.v2.core.EventDestination>>() {}.getType(),
         "{\"data\":[{\"created\":\"1970-01-12T21:42:34.472Z\",\"description\":\"description\",\"enabled_events\":[\"enabled_events\"],\"event_payload\":\"thin\",\"id\":\"obj_123\",\"name\":\"name\",\"object\":\"v2.core.event_destination\",\"status\":\"disabled\",\"type\":\"amazon_eventbridge\",\"updated\":\"1970-01-03T17:07:10.277Z\",\"livemode\":true}],\"next_page_url\":null,\"previous_page_url\":null}");
     StripeClient client = new StripeClient(networkSpy);
 
     com.stripe.param.v2.core.EventDestinationListParams params =
         com.stripe.param.v2.core.EventDestinationListParams.builder().build();
 
-    com.stripe.model.v2.StripeCollection<com.stripe.model.v2.EventDestination> stripeCollection =
-        client.v2().core().eventDestinations().list(params);
+    com.stripe.model.v2.StripeCollection<com.stripe.model.v2.core.EventDestination>
+        stripeCollection = client.v2().core().eventDestinations().list(params);
     assertNotNull(stripeCollection);
     verifyRequest(
         BaseAddress.API,
@@ -27209,7 +27205,7 @@ public void testV2CoreEventDestinationPostServices() throws StripeException {
         "/v2/core/event_destinations",
         null,
         null,
-        com.stripe.model.v2.EventDestination.class,
+        com.stripe.model.v2.core.EventDestination.class,
         "{\"created\":\"1970-01-12T21:42:34.472Z\",\"description\":\"description\",\"enabled_events\":[\"enabled_events\"],\"event_payload\":\"thin\",\"id\":\"obj_123\",\"name\":\"name\",\"object\":\"v2.core.event_destination\",\"status\":\"disabled\",\"type\":\"amazon_eventbridge\",\"updated\":\"1970-01-03T17:07:10.277Z\",\"livemode\":true}");
     StripeClient client = new StripeClient(networkSpy);
 
@@ -27222,7 +27218,7 @@ public void testV2CoreEventDestinationPostServices() throws StripeException {
             .setType(com.stripe.param.v2.core.EventDestinationCreateParams.Type.AMAZON_EVENTBRIDGE)
             .build();
 
-    com.stripe.model.v2.EventDestination eventDestination =
+    com.stripe.model.v2.core.EventDestination eventDestination =
         client.v2().core().eventDestinations().create(params);
     assertNotNull(eventDestination);
     verifyRequest(
@@ -27264,14 +27260,14 @@ public void testV2CoreEventDestinationGet2Services() throws StripeException {
         "/v2/core/event_destinations/id_123",
         null,
         null,
-        com.stripe.model.v2.EventDestination.class,
+        com.stripe.model.v2.core.EventDestination.class,
         "{\"created\":\"1970-01-12T21:42:34.472Z\",\"description\":\"description\",\"enabled_events\":[\"enabled_events\"],\"event_payload\":\"thin\",\"id\":\"obj_123\",\"name\":\"name\",\"object\":\"v2.core.event_destination\",\"status\":\"disabled\",\"type\":\"amazon_eventbridge\",\"updated\":\"1970-01-03T17:07:10.277Z\",\"livemode\":true}");
     StripeClient client = new StripeClient(networkSpy);
 
     com.stripe.param.v2.core.EventDestinationRetrieveParams params =
         com.stripe.param.v2.core.EventDestinationRetrieveParams.builder().build();
 
-    com.stripe.model.v2.EventDestination eventDestination =
+    com.stripe.model.v2.core.EventDestination eventDestination =
         client.v2().core().eventDestinations().retrieve("id_123", params);
     assertNotNull(eventDestination);
     verifyRequest(
@@ -27290,14 +27286,14 @@ public void testV2CoreEventDestinationPost2Services() throws StripeException {
         "/v2/core/event_destinations/id_123",
         null,
         null,
-        com.stripe.model.v2.EventDestination.class,
+        com.stripe.model.v2.core.EventDestination.class,
         "{\"created\":\"1970-01-12T21:42:34.472Z\",\"description\":\"description\",\"enabled_events\":[\"enabled_events\"],\"event_payload\":\"thin\",\"id\":\"obj_123\",\"name\":\"name\",\"object\":\"v2.core.event_destination\",\"status\":\"disabled\",\"type\":\"amazon_eventbridge\",\"updated\":\"1970-01-03T17:07:10.277Z\",\"livemode\":true}");
     StripeClient client = new StripeClient(networkSpy);
 
     com.stripe.param.v2.core.EventDestinationUpdateParams params =
         com.stripe.param.v2.core.EventDestinationUpdateParams.builder().build();
 
-    com.stripe.model.v2.EventDestination eventDestination =
+    com.stripe.model.v2.core.EventDestination eventDestination =
         client.v2().core().eventDestinations().update("id_123", params);
     assertNotNull(eventDestination);
     verifyRequest(
@@ -27316,11 +27312,11 @@ public void testV2CoreEventDestinationPost3Services() throws StripeException {
         "/v2/core/event_destinations/id_123/disable",
         null,
         null,
-        com.stripe.model.v2.EventDestination.class,
+        com.stripe.model.v2.core.EventDestination.class,
         "{\"created\":\"1970-01-12T21:42:34.472Z\",\"description\":\"description\",\"enabled_events\":[\"enabled_events\"],\"event_payload\":\"thin\",\"id\":\"obj_123\",\"name\":\"name\",\"object\":\"v2.core.event_destination\",\"status\":\"disabled\",\"type\":\"amazon_eventbridge\",\"updated\":\"1970-01-03T17:07:10.277Z\",\"livemode\":true}");
     StripeClient client = new StripeClient(networkSpy);
 
-    com.stripe.model.v2.EventDestination eventDestination =
+    com.stripe.model.v2.core.EventDestination eventDestination =
         client.v2().core().eventDestinations().disable("id_123");
     assertNotNull(eventDestination);
     verifyRequest(
@@ -27339,11 +27335,11 @@ public void testV2CoreEventDestinationPost4Services() throws StripeException {
         "/v2/core/event_destinations/id_123/enable",
         null,
         null,
-        com.stripe.model.v2.EventDestination.class,
+        com.stripe.model.v2.core.EventDestination.class,
         "{\"created\":\"1970-01-12T21:42:34.472Z\",\"description\":\"description\",\"enabled_events\":[\"enabled_events\"],\"event_payload\":\"thin\",\"id\":\"obj_123\",\"name\":\"name\",\"object\":\"v2.core.event_destination\",\"status\":\"disabled\",\"type\":\"amazon_eventbridge\",\"updated\":\"1970-01-03T17:07:10.277Z\",\"livemode\":true}");
     StripeClient client = new StripeClient(networkSpy);
 
-    com.stripe.model.v2.EventDestination eventDestination =
+    com.stripe.model.v2.core.EventDestination eventDestination =
         client.v2().core().eventDestinations().enable("id_123");
     assertNotNull(eventDestination);
     verifyRequest(
@@ -27362,11 +27358,11 @@ public void testV2CoreEventDestinationPost5Services() throws StripeException {
         "/v2/core/event_destinations/id_123/ping",
         null,
         null,
-        com.stripe.model.v2.Event.class,
+        com.stripe.model.v2.core.Event.class,
         "{\"created\":\"1970-01-12T21:42:34.472Z\",\"id\":\"obj_123\",\"object\":\"v2.core.event\",\"type\":\"type\",\"livemode\":true}");
     StripeClient client = new StripeClient(networkSpy);
 
-    com.stripe.model.v2.Event event = client.v2().core().eventDestinations().ping("id_123");
+    com.stripe.model.v2.core.Event event = client.v2().core().eventDestinations().ping("id_123");
     assertNotNull(event);
     verifyRequest(
         BaseAddress.API,
@@ -28854,6 +28850,35 @@ public void testV2PaymentsOffSessionPaymentPost2Services() throws StripeExceptio
         null);
   }
 
+  @Test
+  public void testV2PaymentsOffSessionPaymentPost3Services() throws StripeException {
+    stubRequest(
+        BaseAddress.API,
+        ApiResource.RequestMethod.POST,
+        "/v2/payments/off_session_payments/id_123/capture",
+        null,
+        null,
+        com.stripe.model.v2.payments.OffSessionPayment.class,
+        "{\"amount_requested\":{\"currency\":\"USD\",\"value\":47},\"cadence\":\"unscheduled\",\"compartment_id\":\"compartment_id\",\"created\":\"1970-01-12T21:42:34.472Z\",\"customer\":\"customer\",\"id\":\"obj_123\",\"livemode\":true,\"metadata\":{\"key\":\"metadata\"},\"object\":\"v2.payments.off_session_payment\",\"payment_method\":\"payment_method\",\"payments_orchestration\":{\"enabled\":true},\"retry_details\":{\"attempts\":542738246,\"retry_strategy\":\"scheduled\"},\"status\":\"pending\"}");
+    StripeClient client = new StripeClient(networkSpy);
+
+    com.stripe.param.v2.payments.OffSessionPaymentCaptureParams params =
+        com.stripe.param.v2.payments.OffSessionPaymentCaptureParams.builder()
+            .setAmountToCapture(1374310455L)
+            .putMetadata("key", "metadata")
+            .build();
+
+    com.stripe.model.v2.payments.OffSessionPayment offSessionPayment =
+        client.v2().payments().offSessionPayments().capture("id_123", params);
+    assertNotNull(offSessionPayment);
+    verifyRequest(
+        BaseAddress.API,
+        ApiResource.RequestMethod.POST,
+        "/v2/payments/off_session_payments/id_123/capture",
+        params.toMap(),
+        null);
+  }
+
   @Test
   public void testV2TaxAutomaticRulePostServices() throws StripeException {
     stubRequest(
diff --git a/src/test/java/com/stripe/model/v2/EventTests.java b/src/test/java/com/stripe/model/v2/EventTests.java
index 8e06a7405e3..dabebb682b8 100644
--- a/src/test/java/com/stripe/model/v2/EventTests.java
+++ b/src/test/java/com/stripe/model/v2/EventTests.java
@@ -6,6 +6,7 @@
 import com.stripe.events.V1BillingMeterErrorReportTriggeredEvent;
 import com.stripe.exception.StripeException;
 import com.stripe.model.billing.Meter;
+import com.stripe.model.v2.core.Event;
 import com.stripe.net.ApiResource;
 import java.io.IOException;
 import java.time.Instant;
@@ -121,9 +122,9 @@ public void retrieveObjectFetchesAndDeserializesObject() throws StripeException,
         Meter.class,
         getResourceAsString("/api_fixtures/billing_meter.json"));
 
-    assertEquals("/v1/billing/meters/meter_123", event.getRelatedObject().url);
-    assertEquals("meter_123", event.getRelatedObject().id);
-    assertEquals("billing.meter", event.getRelatedObject().type);
+    assertEquals("/v1/billing/meters/meter_123", event.getRelatedObject().getUrl());
+    assertEquals("meter_123", event.getRelatedObject().getId());
+    assertEquals("billing.meter", event.getRelatedObject().getType());
 
     Meter meter = event.fetchRelatedObject();