diff --git a/eng/.docsettings.yml b/eng/.docsettings.yml
index fde81ca0d4b8f..d82894fb16af9 100644
--- a/eng/.docsettings.yml
+++ b/eng/.docsettings.yml
@@ -57,7 +57,7 @@ known_content_issues:
   - ['README.md', '#3113']
   - ['sdk/applicationinsights/microsoft-azure-applicationinsights-query/README.md', '#3113']
   - ['sdk/batch/microsoft-azure-batch/README.md', '#3113']
-  - ['eventgrid/data-plane/README.md', '#3113']
+  - ['sdk/eventgrid/microsoft-azure-eventgrid/README.md', '#3113']
   - ['eventhubs/data-plane/readme.md', '#3113']
   - ['eventhubs/data-plane/azure-eventhubs-eph/Readme.md', '#3113']
   - ['sdk/authorization/microsoft-azure-authentication-msi-token-provider/readme.md', '#3113']
diff --git a/eventgrid/data-plane/README.md b/sdk/eventgrid/microsoft-azure-eventgrid/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/README.md
rename to sdk/eventgrid/microsoft-azure-eventgrid/README.md
diff --git a/eventgrid/data-plane/pom.xml b/sdk/eventgrid/microsoft-azure-eventgrid/pom.xml
old mode 100755
new mode 100644
similarity index 96%
rename from eventgrid/data-plane/pom.xml
rename to sdk/eventgrid/microsoft-azure-eventgrid/pom.xml
index fbef3bf157f7a..674f7f407d618
--- a/eventgrid/data-plane/pom.xml
+++ b/sdk/eventgrid/microsoft-azure-eventgrid/pom.xml
@@ -14,7 +14,7 @@
     <name>Microsoft Azure SDK for eventgrid</name>
     <description>This package contains Microsoft Azure EventGrid SDK.</description>
     <url>https://github.com/Azure/azure-sdk-for-java</url>
-    <licenses>
+      <licenses>
         <license>
             <name>The MIT License (MIT)</name>
             <url>http://opensource.org/licenses/MIT</url>
@@ -54,6 +54,11 @@
             <version>1.5.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.6</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/DomainCredentials.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/DomainCredentials.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/DomainCredentials.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/DomainCredentials.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/EventGridClient.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/EventGridClient.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/EventGridClient.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/EventGridClient.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/TopicCredentials.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/TopicCredentials.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/TopicCredentials.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/TopicCredentials.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/customization/EventGridSubscriber.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/customization/EventGridSubscriber.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/customization/EventGridSubscriber.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/customization/EventGridSubscriber.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/customization/SystemEventTypeMappings.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/customization/SystemEventTypeMappings.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/customization/SystemEventTypeMappings.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/customization/SystemEventTypeMappings.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/customization/SystemEventTypes.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/customization/SystemEventTypes.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/customization/SystemEventTypes.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/customization/SystemEventTypes.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/implementation/EventGridClientImpl.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/implementation/EventGridClientImpl.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/implementation/EventGridClientImpl.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/implementation/EventGridClientImpl.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/implementation/package-info.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/implementation/package-info.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/implementation/package-info.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/implementation/package-info.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/AppConfigurationKeyValueDeletedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/AppConfigurationKeyValueDeletedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/AppConfigurationKeyValueDeletedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/AppConfigurationKeyValueDeletedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/AppConfigurationKeyValueModifiedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/AppConfigurationKeyValueModifiedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/AppConfigurationKeyValueModifiedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/AppConfigurationKeyValueModifiedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryArtifactEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryArtifactEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryArtifactEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryArtifactEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryArtifactEventTarget.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryArtifactEventTarget.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryArtifactEventTarget.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryArtifactEventTarget.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryChartDeletedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryChartDeletedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryChartDeletedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryChartDeletedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryChartPushedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryChartPushedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryChartPushedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryChartPushedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventActor.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventActor.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventActor.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventActor.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventRequest.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventRequest.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventRequest.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventRequest.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventSource.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventSource.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventSource.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventSource.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventTarget.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventTarget.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventTarget.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryEventTarget.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryImageDeletedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryImageDeletedEventData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryImageDeletedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryImageDeletedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryImagePushedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryImagePushedEventData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryImagePushedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ContainerRegistryImagePushedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceConnectionStateEventInfo.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceConnectionStateEventInfo.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceConnectionStateEventInfo.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceConnectionStateEventInfo.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceConnectionStateEventProperties.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceConnectionStateEventProperties.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceConnectionStateEventProperties.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceConnectionStateEventProperties.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceLifeCycleEventProperties.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceLifeCycleEventProperties.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceLifeCycleEventProperties.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceLifeCycleEventProperties.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTelemetryEventProperties.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTelemetryEventProperties.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTelemetryEventProperties.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTelemetryEventProperties.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinInfo.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinInfo.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinInfo.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinInfo.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinInfoProperties.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinInfoProperties.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinInfoProperties.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinInfoProperties.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinInfoX509Thumbprint.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinInfoX509Thumbprint.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinInfoX509Thumbprint.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinInfoX509Thumbprint.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinMetadata.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinMetadata.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinMetadata.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinMetadata.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinProperties.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinProperties.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinProperties.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/DeviceTwinProperties.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/EventGridEvent.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/EventGridEvent.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/EventGridEvent.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/EventGridEvent.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/EventHubCaptureFileCreatedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/EventHubCaptureFileCreatedEventData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/EventHubCaptureFileCreatedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/EventHubCaptureFileCreatedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceConnectedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceConnectedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceConnectedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceConnectedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceCreatedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceCreatedEventData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceCreatedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceCreatedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceDeletedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceDeletedEventData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceDeletedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceDeletedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceDisconnectedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceDisconnectedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceDisconnectedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceDisconnectedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceTelemetryEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceTelemetryEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceTelemetryEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/IotHubDeviceTelemetryEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/JobState.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/JobState.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/JobState.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/JobState.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceEnteredEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceEnteredEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceEnteredEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceEnteredEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceEventProperties.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceEventProperties.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceEventProperties.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceEventProperties.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceExitedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceExitedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceExitedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceExitedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceGeometry.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceGeometry.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceGeometry.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceGeometry.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceResultEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceResultEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceResultEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MapsGeofenceResultEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobCanceledEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobCanceledEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobCanceledEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobCanceledEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobCancelingEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobCancelingEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobCancelingEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobCancelingEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobError.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobError.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobError.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobError.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErrorCategory.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErrorCategory.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErrorCategory.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErrorCategory.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErrorCode.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErrorCode.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErrorCode.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErrorCode.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErrorDetail.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErrorDetail.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErrorDetail.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErrorDetail.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErroredEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErroredEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErroredEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobErroredEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobFinishedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobFinishedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobFinishedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobFinishedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutput.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutput.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutput.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutput.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputAsset.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputAsset.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputAsset.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputAsset.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputCanceledEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputCanceledEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputCanceledEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputCanceledEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputCancelingEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputCancelingEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputCancelingEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputCancelingEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputErroredEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputErroredEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputErroredEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputErroredEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputFinishedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputFinishedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputFinishedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputFinishedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputProcessingEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputProcessingEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputProcessingEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputProcessingEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputProgressEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputProgressEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputProgressEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputProgressEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputScheduledEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputScheduledEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputScheduledEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputScheduledEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputStateChangeEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputStateChangeEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputStateChangeEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobOutputStateChangeEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobProcessingEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobProcessingEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobProcessingEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobProcessingEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobRetry.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobRetry.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobRetry.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobRetry.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobScheduledEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobScheduledEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobScheduledEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobScheduledEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobState.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobState.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobState.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobState.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobStateChangeEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobStateChangeEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobStateChangeEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaJobStateChangeEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventConnectionRejectedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventConnectionRejectedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventConnectionRejectedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventConnectionRejectedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventEncoderConnectedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventEncoderConnectedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventEncoderConnectedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventEncoderConnectedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventEncoderDisconnectedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventEncoderDisconnectedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventEncoderDisconnectedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventEncoderDisconnectedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingDataChunkDroppedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingDataChunkDroppedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingDataChunkDroppedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingDataChunkDroppedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingStreamReceivedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingStreamReceivedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingStreamReceivedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingStreamReceivedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingStreamsOutOfSyncEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingStreamsOutOfSyncEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingStreamsOutOfSyncEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingStreamsOutOfSyncEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingVideoStreamsOutOfSyncEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingVideoStreamsOutOfSyncEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingVideoStreamsOutOfSyncEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIncomingVideoStreamsOutOfSyncEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIngestHeartbeatEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIngestHeartbeatEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIngestHeartbeatEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventIngestHeartbeatEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventTrackDiscontinuityDetectedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventTrackDiscontinuityDetectedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventTrackDiscontinuityDetectedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/MediaLiveEventTrackDiscontinuityDetectedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceActionCancelData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceActionCancelData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceActionCancelData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceActionCancelData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceActionFailureData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceActionFailureData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceActionFailureData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceActionFailureData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceActionSuccessData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceActionSuccessData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceActionSuccessData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceActionSuccessData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceDeleteCancelData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceDeleteCancelData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceDeleteCancelData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceDeleteCancelData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceDeleteFailureData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceDeleteFailureData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceDeleteFailureData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceDeleteFailureData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceDeleteSuccessData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceDeleteSuccessData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceDeleteSuccessData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceDeleteSuccessData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceWriteCancelData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceWriteCancelData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceWriteCancelData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceWriteCancelData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceWriteFailureData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceWriteFailureData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceWriteFailureData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceWriteFailureData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceWriteSuccessData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceWriteSuccessData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ResourceWriteSuccessData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ResourceWriteSuccessData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ServiceBusActiveMessagesAvailableWithNoListenersEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ServiceBusActiveMessagesAvailableWithNoListenersEventData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ServiceBusActiveMessagesAvailableWithNoListenersEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ServiceBusActiveMessagesAvailableWithNoListenersEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ServiceBusDeadletterMessagesAvailableWithNoListenersEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ServiceBusDeadletterMessagesAvailableWithNoListenersEventData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/ServiceBusDeadletterMessagesAvailableWithNoListenersEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/ServiceBusDeadletterMessagesAvailableWithNoListenersEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/StorageBlobCreatedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/StorageBlobCreatedEventData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/StorageBlobCreatedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/StorageBlobCreatedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/StorageBlobDeletedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/StorageBlobDeletedEventData.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/StorageBlobDeletedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/StorageBlobDeletedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/SubscriptionDeletedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/SubscriptionDeletedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/SubscriptionDeletedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/SubscriptionDeletedEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/SubscriptionValidationEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/SubscriptionValidationEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/SubscriptionValidationEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/SubscriptionValidationEventData.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/SubscriptionValidationResponse.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/SubscriptionValidationResponse.java
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/SubscriptionValidationResponse.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/SubscriptionValidationResponse.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/package-info.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/package-info.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/models/package-info.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/models/package-info.java
diff --git a/eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/package-info.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/package-info.java
old mode 100755
new mode 100644
similarity index 100%
rename from eventgrid/data-plane/src/main/java/com/microsoft/azure/eventgrid/package-info.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/main/java/com/microsoft/azure/eventgrid/package-info.java
diff --git a/eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/EventGridTests.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/EventGridTests.java
old mode 100755
new mode 100644
similarity index 98%
rename from eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/EventGridTests.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/EventGridTests.java
index 05473791aa670..962ad6805904d
--- a/eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/EventGridTests.java
+++ b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/EventGridTests.java
@@ -10,6 +10,7 @@
 
 import org.joda.time.DateTime;
 import org.junit.Test;
+import org.junit.Ignore;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertEquals;
@@ -21,6 +22,7 @@
 
 public class EventGridTests {
     @Test
+    @Ignore
     public void canPublishEvent() throws Exception {
         String endpoint = System.getenv("EG_ENDPOINT");
         String key = System.getenv("EG_KEY");
diff --git a/eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/customization/CustomizationTests.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/customization/CustomizationTests.java
similarity index 99%
rename from eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/customization/CustomizationTests.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/customization/CustomizationTests.java
index d2dc11318afb7..c9c64040e7781 100644
--- a/eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/customization/CustomizationTests.java
+++ b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/customization/CustomizationTests.java
@@ -70,7 +70,7 @@
 import com.microsoft.azure.eventgrid.models.SubscriptionValidationEventData;
 import org.junit.Assert;
 import org.junit.Test;
-import sun.misc.IOUtils;
+import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -1038,7 +1038,7 @@ public void consumeResourceWriteSuccessEvent() throws IOException  {
     private String getTestPayloadFromFile(String fileName) {
         ClassLoader classLoader = getClass().getClassLoader();
         try {
-            byte[] bytes = IOUtils.readFully(classLoader.getResourceAsStream("customization\\" + fileName), -1, true);
+            byte[] bytes = IOUtils.toByteArray(classLoader.getResourceAsStream("customization/" + fileName));
             return new String(bytes);
         } catch (IOException e) {
             throw new RuntimeException(e);
diff --git a/eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/customization/models/ContosoItemReceivedEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/customization/models/ContosoItemReceivedEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/customization/models/ContosoItemReceivedEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/customization/models/ContosoItemReceivedEventData.java
diff --git a/eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/customization/models/ContosoItemSentEventData.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/customization/models/ContosoItemSentEventData.java
similarity index 100%
rename from eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/customization/models/ContosoItemSentEventData.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/customization/models/ContosoItemSentEventData.java
diff --git a/eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/customization/models/DroneShippingInfo.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/customization/models/DroneShippingInfo.java
similarity index 100%
rename from eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/customization/models/DroneShippingInfo.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/customization/models/DroneShippingInfo.java
diff --git a/eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/customization/models/RocketShippingInfo.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/customization/models/RocketShippingInfo.java
similarity index 100%
rename from eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/customization/models/RocketShippingInfo.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/customization/models/RocketShippingInfo.java
diff --git a/eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/customization/models/ShippingInfo.java b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/customization/models/ShippingInfo.java
similarity index 100%
rename from eventgrid/data-plane/src/test/java/com/microsoft/azure/eventgrid/customization/models/ShippingInfo.java
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/java/com/microsoft/azure/eventgrid/customization/models/ShippingInfo.java
diff --git a/eventgrid/data-plane/src/test/resources/customization/AppConfigurationKeyValueDeleted.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/AppConfigurationKeyValueDeleted.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/AppConfigurationKeyValueDeleted.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/AppConfigurationKeyValueDeleted.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/AppConfigurationKeyValueModified.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/AppConfigurationKeyValueModified.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/AppConfigurationKeyValueModified.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/AppConfigurationKeyValueModified.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ContainerRegistryChartDeletedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ContainerRegistryChartDeletedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ContainerRegistryChartDeletedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ContainerRegistryChartDeletedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ContainerRegistryChartPushedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ContainerRegistryChartPushedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ContainerRegistryChartPushedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ContainerRegistryChartPushedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ContainerRegistryImageDeletedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ContainerRegistryImageDeletedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ContainerRegistryImageDeletedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ContainerRegistryImageDeletedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ContainerRegistryImagePushedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ContainerRegistryImagePushedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ContainerRegistryImagePushedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ContainerRegistryImagePushedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/CustomEventWithArrayData.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/CustomEventWithArrayData.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/CustomEventWithArrayData.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/CustomEventWithArrayData.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/CustomEventWithBooleanData.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/CustomEventWithBooleanData.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/CustomEventWithBooleanData.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/CustomEventWithBooleanData.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/CustomEventWithPolymorphicData.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/CustomEventWithPolymorphicData.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/CustomEventWithPolymorphicData.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/CustomEventWithPolymorphicData.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/CustomEventWithStringData.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/CustomEventWithStringData.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/CustomEventWithStringData.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/CustomEventWithStringData.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/CustomEvents.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/CustomEvents.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/CustomEvents.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/CustomEvents.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/EventGridSubscriptionDeletedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/EventGridSubscriptionDeletedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/EventGridSubscriptionDeletedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/EventGridSubscriptionDeletedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/EventGridSubscriptionValidationEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/EventGridSubscriptionValidationEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/EventGridSubscriptionValidationEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/EventGridSubscriptionValidationEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/EventHubCaptureFileCreatedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/EventHubCaptureFileCreatedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/EventHubCaptureFileCreatedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/EventHubCaptureFileCreatedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/IoTHubDeviceConnectedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/IoTHubDeviceConnectedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/IoTHubDeviceConnectedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/IoTHubDeviceConnectedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/IoTHubDeviceCreatedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/IoTHubDeviceCreatedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/IoTHubDeviceCreatedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/IoTHubDeviceCreatedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/IoTHubDeviceDeletedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/IoTHubDeviceDeletedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/IoTHubDeviceDeletedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/IoTHubDeviceDeletedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/IoTHubDeviceDisconnectedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/IoTHubDeviceDisconnectedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/IoTHubDeviceDisconnectedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/IoTHubDeviceDisconnectedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/IoTHubDeviceTelemetryEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/IoTHubDeviceTelemetryEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/IoTHubDeviceTelemetryEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/IoTHubDeviceTelemetryEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MapsGeofenceEnteredEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MapsGeofenceEnteredEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MapsGeofenceEnteredEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MapsGeofenceEnteredEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MapsGeofenceExitedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MapsGeofenceExitedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MapsGeofenceExitedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MapsGeofenceExitedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MapsGeofenceResultEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MapsGeofenceResultEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MapsGeofenceResultEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MapsGeofenceResultEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobCanceledEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobCanceledEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobCanceledEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobCanceledEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobCancelingEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobCancelingEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobCancelingEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobCancelingEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobErroredEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobErroredEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobErroredEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobErroredEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobFinishedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobFinishedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobFinishedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobFinishedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobOutputCanceledEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputCanceledEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobOutputCanceledEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputCanceledEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobOutputCancelingEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputCancelingEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobOutputCancelingEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputCancelingEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobOutputErroredEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputErroredEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobOutputErroredEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputErroredEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobOutputFinishedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputFinishedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobOutputFinishedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputFinishedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobOutputProcessingEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputProcessingEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobOutputProcessingEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputProcessingEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobOutputProgressEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputProgressEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobOutputProgressEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputProgressEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobOutputScheduledEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputScheduledEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobOutputScheduledEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputScheduledEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobOutputStateChangeEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputStateChangeEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobOutputStateChangeEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobOutputStateChangeEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobProcessingEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobProcessingEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobProcessingEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobProcessingEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobScheduledEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobScheduledEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobScheduledEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobScheduledEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaJobStateChangeEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobStateChangeEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaJobStateChangeEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaJobStateChangeEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaLiveEventConnectionRejectedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventConnectionRejectedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaLiveEventConnectionRejectedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventConnectionRejectedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaLiveEventEncoderConnectedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventEncoderConnectedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaLiveEventEncoderConnectedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventEncoderConnectedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaLiveEventEncoderDisconnectedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventEncoderDisconnectedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaLiveEventEncoderDisconnectedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventEncoderDisconnectedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaLiveEventIncomingDataChunkDroppedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventIncomingDataChunkDroppedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaLiveEventIncomingDataChunkDroppedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventIncomingDataChunkDroppedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaLiveEventIncomingStreamReceivedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventIncomingStreamReceivedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaLiveEventIncomingStreamReceivedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventIncomingStreamReceivedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaLiveEventIncomingStreamsOutOfSyncEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventIncomingStreamsOutOfSyncEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaLiveEventIncomingStreamsOutOfSyncEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventIncomingStreamsOutOfSyncEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaLiveEventIncomingVideoStreamsOutOfSyncEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventIncomingVideoStreamsOutOfSyncEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaLiveEventIncomingVideoStreamsOutOfSyncEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventIncomingVideoStreamsOutOfSyncEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaLiveEventIngestHeartbeatEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventIngestHeartbeatEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaLiveEventIngestHeartbeatEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventIngestHeartbeatEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaLiveEventTrackDiscontinuityDetectedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventTrackDiscontinuityDetectedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaLiveEventTrackDiscontinuityDetectedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaLiveEventTrackDiscontinuityDetectedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MediaServicesJobStateChangedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaServicesJobStateChangedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MediaServicesJobStateChangedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MediaServicesJobStateChangedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/MultipleEventsInSameBatch.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MultipleEventsInSameBatch.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/MultipleEventsInSameBatch.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/MultipleEventsInSameBatch.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ResourceActionCancelEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceActionCancelEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ResourceActionCancelEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceActionCancelEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ResourceActionFailureEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceActionFailureEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ResourceActionFailureEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceActionFailureEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ResourceActionSuccessEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceActionSuccessEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ResourceActionSuccessEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceActionSuccessEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ResourceDeleteCancelEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceDeleteCancelEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ResourceDeleteCancelEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceDeleteCancelEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ResourceDeleteFailureEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceDeleteFailureEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ResourceDeleteFailureEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceDeleteFailureEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ResourceDeleteSuccessEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceDeleteSuccessEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ResourceDeleteSuccessEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceDeleteSuccessEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ResourceWriteCancelEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceWriteCancelEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ResourceWriteCancelEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceWriteCancelEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ResourceWriteFailureEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceWriteFailureEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ResourceWriteFailureEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceWriteFailureEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ResourceWriteSuccessEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceWriteSuccessEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ResourceWriteSuccessEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ResourceWriteSuccessEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ServiceBusActiveMessagesAvailableWithNoListenersEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ServiceBusActiveMessagesAvailableWithNoListenersEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ServiceBusActiveMessagesAvailableWithNoListenersEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ServiceBusActiveMessagesAvailableWithNoListenersEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/ServiceBusDeadletterMessagesAvailableWithNoListenersEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ServiceBusDeadletterMessagesAvailableWithNoListenersEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/ServiceBusDeadletterMessagesAvailableWithNoListenersEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/ServiceBusDeadletterMessagesAvailableWithNoListenersEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/StorageBlobCreatedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/StorageBlobCreatedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/StorageBlobCreatedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/StorageBlobCreatedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/StorageBlobDeletedEvent.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/StorageBlobDeletedEvent.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/StorageBlobDeletedEvent.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/StorageBlobDeletedEvent.json
diff --git a/eventgrid/data-plane/src/test/resources/customization/StorageBlobDeletedEventWithExtraProperty.json b/sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/StorageBlobDeletedEventWithExtraProperty.json
similarity index 100%
rename from eventgrid/data-plane/src/test/resources/customization/StorageBlobDeletedEventWithExtraProperty.json
rename to sdk/eventgrid/microsoft-azure-eventgrid/src/test/resources/customization/StorageBlobDeletedEventWithExtraProperty.json
diff --git a/sdk/eventgrid/pom.service.xml b/sdk/eventgrid/pom.service.xml
new file mode 100644
index 0000000000000..74589c55c2717
--- /dev/null
+++ b/sdk/eventgrid/pom.service.xml
@@ -0,0 +1,14 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved.
+     Licensed under the MIT License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.azure</groupId>
+  <artifactId>azure-eventgrid-service</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0.0</version><!-- Need not change for every release-->
+  <modules>
+    <module>microsoft-azure-eventgrid</module>
+  </modules>
+</project>