diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 46922a3c97b62..24bc4fbf54b50 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -102,12 +102,16 @@ jobs:
           BuildSHA: $(Build.SourceVersion)
           RepoId: 'Azure/azure-sdk-for-java'
 
+      - template: ../steps/generate-project-list.yml
+        parameters:
+          Artifacts: ${{parameters.Artifacts}}
+
       - task: Maven@3
         displayName: 'Build and Package'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
+          mavenPomFile: pom.xml
           goals: 'package'
-          options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview' # We include template-module so we ensure it always builds in CI
+          options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview -pl $(ProjectList) -am' # We include template-module so we ensure it always builds in CI
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaVersion)
@@ -155,32 +159,23 @@ jobs:
           Options: --batch-mode
           MavenOptions: $(MemoryOptions) $(LoggingOptions)
 
+      - template: ../steps/generate-project-list.yml
+        parameters:
+          Artifacts: ${{parameters.Artifacts}}
+
       # maven dependency:tree needs to be able to resolve dependencies, so these should be installed.
       - task: Maven@3
         displayName: 'Build and Install'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
+          mavenPomFile: pom.xml
           goals: 'install'
-          options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true'
+          options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl $(ProjectList) -am'
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: '1.11'
           jdkArchitectureOption: 'x64'
           publishJUnitResults: false
 
-      - pwsh: |
-          if ("${{parameters.SDKType}}" -ieq "client") {
-            $excludes = "^(microsoft|mgmt)"
-          } else {
-            $excludes = "^(azure|mgmt)"
-          }
-
-          $directory = "$(Build.SourcesDirectory)/sdk/${{parameters.ServiceDirectory}}"
-
-          Write-Host "Directory: '$directory'. Excludes: '$excludes'"
-          $(Build.SourcesDirectory)/eng/Set-ComponentRegistrations.ps1 $directory -ExcludeRegex $excludes -Verbose
-        displayName: 'Generate cgmanifest.json'
-
       - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
         # ComponentGovernance is currently unable to run on pull requests of public projects. Running on non-PR
         # builds should be sufficient.
@@ -190,8 +185,8 @@ jobs:
       - task: Maven@3
         displayName: 'Run SpotBugs, Checkstyle, RevApi, and Javadoc'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
-          options: '--no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme-windows'
+          mavenPomFile: pom.xml
+          options: '--no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme-windows -pl $(ProjectList)'
           mavenOptions: '$(MemoryOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: '1.11'
@@ -254,11 +249,15 @@ jobs:
         condition: and(succeeded(), eq(variables['ShouldRunSourceTests'],'true'))
         displayName: 'Update versions for source build'
 
+      - template: ../steps/generate-project-list.yml
+        parameters:
+          Artifacts: ${{parameters.Artifacts}}
+
       - task: Maven@3
         displayName: 'Run tests'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
-          options: ${{ parameters.TestOptions }}
+          mavenPomFile: pom.xml
+          options: ${{ parameters.TestOptions }} -pl $(ProjectList) -am
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaVersion)
@@ -273,45 +272,4 @@ jobs:
         condition: and(always(), or(ne(variables['TestFromSource'],'true'), eq(variables['ShouldRunSourceTests'],'true')))
         inputs:
           mergeTestResults: true
-          testRunTitle: $(RunTitle)
-
-      # HACK: This has been disabled to unblock releases where aggregate code
-      #       coverage reporting was causing agent timeouts. We've got an issue
-      #       to discuss how to handle aggregate-style reporting across the repo
-      #       but at the moment this isn't going to work:
-      #
-      #         https://github.com/Azure/azure-sdk-for-java/issues/7271
-      #
-      #     # Generate JaCoCo code coverage report on Java 11, Linux builds if the build reason is not PR.
-      # - task: Maven@3
-      #   displayName: 'Generate aggregate code coverage report'
-      #   condition: and(eq(variables['OsName'], 'Linux'), eq(variables['JavaVersion'], '1.11'), ne(variables['Build.Reason'], 'PullRequest'))
-      #   inputs:
-      #       # Aggregate reports for non-PR builds will use pom.client.xml and include non-shipping modules
-      #       mavenPomFile: pom.client.xml
-      #       options: '$(DefaultOptions) -Dinclude-non-shipping-modules -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true'
-      #       mavenOptions: '-Xmx3072m $(LoggingOptions)'
-      #       javaHomeOption: 'JDKVersion'
-      #       jdkVersionOption: $(JavaVersion)
-      #       jdkArchitectureOption: 'x64'
-      #       publishJUnitResults: false
-      #       goals: 'verify'
-
-      #   # Azure DevOps only seems to respect the last code coverage result published, so only do this for Linux + Java LTS.
-      #   # Code coverage reporting is setup only for Track 2 modules.
-      # - task: PublishCodeCoverageResults@1
-      #   condition: and(eq(variables['OsName'], 'Linux'), eq(variables['JavaVersion'], '1.11'), ne(variables['Build.Reason'], 'PullRequest'))
-      #   inputs:
-      #       codeCoverageTool: JaCoCo
-      #       summaryFileLocation: eng/jacoco-test-coverage/target/site/test-coverage/jacoco.xml
-      #       reportDirectory: eng/jacoco-test-coverage/target/site/test-coverage/
-      #       failIfCoverageEmpty: true
-
-      #   # Publish code coverage to an artifact so it can be uploaded to the Maven site.
-      #   # Do this for track 2 modules only. Code coverage from previous step is only published for Linux + Java LTS.
-      # - task: PublishPipelineArtifact@0
-      #   displayName: 'Publish coverage artifact'
-      #   condition: and(eq(variables['OsName'], 'Linux'), eq(variables['JavaVersion'], '1.11'), ne(variables['Build.Reason'], 'PullRequest'))
-      #   inputs:
-      #       artifactName: coverage
-      #       targetPath: eng/jacoco-test-coverage/target/site/
+          testRunTitle: $(RunTitle)
\ No newline at end of file
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-data.yml b/eng/pipelines/templates/jobs/archetype-sdk-data.yml
index ffc60a79525c1..39ab708e5b3c2 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-data.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-data.yml
@@ -90,12 +90,16 @@ jobs:
           BuildSHA: $(Build.SourceVersion)
           RepoId: 'Azure/azure-sdk-for-java'
 
+      - template: ../steps/generate-project-list.yml
+        parameters:
+          Artifacts: ${{parameters.Artifacts}}
+  
       - task: Maven@3
         displayName: 'Build and Package'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
+          mavenPomFile: pom.xml
           goals: 'package'
-          options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview' # We include template-module so we ensure it always builds in CI
+          options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview -pl $(ProjectList) -am -amd' # We include template-module so we ensure it always builds in CI
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaVersion)
@@ -150,11 +154,15 @@ jobs:
           Options: --batch-mode
           MavenOptions: $(MemoryOptions) $(LoggingOptions)
 
+      - template: ../steps/generate-project-list.yml
+        parameters:
+          Artifacts: ${{parameters.Artifacts}}
+    
       - task: Maven@3
         displayName: 'Install Module and Run SpotBugs, Checkstyle, RevApi, and Javadoc'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
-          options: '--no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme'
+          mavenPomFile: pom.xml
+          options: '--no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme -pl $(ProjectList) -am'
           mavenOptions: '$(MemoryOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: '1.11'
@@ -186,6 +194,10 @@ jobs:
           Options: --batch-mode
           MavenOptions: $(MemoryOptions) $(LoggingOptions)
 
+      - template: ../steps/generate-project-list.yml
+        parameters:
+          Artifacts: ${{parameters.Artifacts}}
+
       - task: Maven@3
         displayName: 'Start Jetty'
         condition: succeeded()
@@ -204,8 +216,8 @@ jobs:
       - task: Maven@3
         displayName: 'Run tests'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
-          options: ${{ parameters.TestOptions }}
+          mavenPomFile: pom.xml
+          options: ${{ parameters.TestOptions }} -pl $(ProjectList) -am
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaVersion)
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
index 2a47c53997383..57ff485803991 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
@@ -92,7 +92,7 @@ jobs:
       - task: Maven@3
         displayName: $(DisplayName)
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
+          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.xml
           ${{ insert }}: ${{ parameters.TestStepMavenInputs }}
         env: ${{ parameters.EnvVars }}
 
diff --git a/eng/pipelines/templates/steps/generate-project-list.yml b/eng/pipelines/templates/steps/generate-project-list.yml
new file mode 100644
index 0000000000000..a015c38a9acfd
--- /dev/null
+++ b/eng/pipelines/templates/steps/generate-project-list.yml
@@ -0,0 +1,18 @@
+# This job template uses the artifact list in the ci.yml file
+# to generate a variable at build time that can be passed into
+# the Maven -pl command-line switch to constrain what subset of
+# projects are targetted based on the artifacts this pipeline
+# produces. The -am and -amd switches are then applied as
+# appropriate to constrain the full graph that is built depending
+# on whether we are doing a recorded test play back or a full live
+# test.
+
+steps:
+- pwsh: |
+    Write-Host "##vso[task.setvariable variable=ProjectList;]"
+  displayName: Initialize project list variable
+
+- ${{each artifact in parameters.Artifacts }}:
+  - pwsh: |
+      Write-Host "##vso[task.setvariable variable=ProjectList;]$(ProjectList),${{artifact.groupId}}:${{artifact.name}}"
+    displayName: Append ${{artifact.groupId}}:${{artifact.name}} to project list
diff --git a/pom.data.xml b/pom.data.xml
index 31c31125c5c98..8c0ea8fd7b3de 100644
--- a/pom.data.xml
+++ b/pom.data.xml
@@ -601,7 +601,6 @@
       </build>
     </profile>
   </profiles>
-
   <modules>
     <module>./sdk/batch/microsoft-azure-batch</module>
     <module>./sdk/eventhubs/microsoft-azure-eventhubs/pom.xml</module>
diff --git a/pom.management.xml b/pom.management.xml
index 1e92a220ace08..926ca96faa1cf 100644
--- a/pom.management.xml
+++ b/pom.management.xml
@@ -758,8 +758,11 @@
       </build>
     </profile>
   </profiles>
+  <!--
   <modules>
+
     <module>./profiles/2018-03-01-hybrid</module>
     <module>./profiles/2019-03-01-hybrid</module>
   </modules>
+  -->
 </project>
diff --git a/pom.xml b/pom.xml
index 5c2b8aa02dcdc..6994a083a0c1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,279 +6,23 @@
   <groupId>com.azure</groupId>
   <artifactId>azure-sdk-all</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.0</version> <!-- {x-version-update;com.azure:azure-sdk-all;current} -->
-
-  <name>Microsoft Azure SDK for Java - All Modules</name>
-  <description>Aggregated POM for Microsoft Azure SDK for Java</description>
-  <url>https://github.com/Azure/azure-sdk-for-java</url>
-  <organization>
-    <name>Microsoft Corporation</name>
-    <url>http://microsoft.com</url>
-  </organization>
-
-  <parent>
-    <groupId>com.azure</groupId>
-    <artifactId>azure-sdk-parent</artifactId>
-    <version>1.6.0</version> <!-- {x-version-update;com.azure:azure-sdk-parent;current} -->
-    <relativePath>./parent/pom.xml</relativePath>
-  </parent>
-
-  <licenses>
-    <license>
-      <name>The MIT License (MIT)</name>
-      <url>http://opensource.org/licenses/MIT</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <id>microsoft</id>
-      <name>Microsoft Corporation</name>
-    </developer>
-  </developers>
-
-  <issueManagement>
-    <system>GitHub</system>
-    <url>${issues.url}</url>
-  </issueManagement>
-
-  <scm>
-    <url>https://github.com/Azure/azure-sdk-for-java</url>
-    <connection>scm:git:https://github.com/Azure/azure-sdk-for-java.git</connection>
-    <developerConnection></developerConnection>
-    <tag>HEAD</tag>
-  </scm>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <packageOutputDirectory>${project.build.directory}</packageOutputDirectory>
-    <legal>
-      <![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    <testMode>playback</testMode>
-    <playbackServerPort>11080</playbackServerPort>
-    <alternativePlaybackServerPort>11081</alternativePlaybackServerPort>
-
-    <site.url>https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java</site.url>
-    <issues.url>https://github.com/Azure/azure-sdk-for-java/issues</issues.url>
-  </properties>
-
-  <build>
-    <plugins>
-      <!-- This plugin scans checkstyle issues in the code -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.1.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-checkstyle-plugin;external_dependency} -->
-        <dependencies>
-          <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>sdk-build-tools</artifactId>
-            <version>1.0.0</version> <!-- {x-version-update;com.azure:sdk-build-tools;external_dependency} -->
-          </dependency>
-          <dependency>
-            <groupId>com.puppycrawl.tools</groupId>
-            <artifactId>checkstyle</artifactId>
-            <version>8.29</version> <!-- {x-version-update;com.puppycrawl.tools:checkstyle;external_dependency} -->
-          </dependency>
-        </dependencies>
-        <configuration>
-          <configLocation>checkstyle/checkstyle.xml</configLocation>
-          <suppressionsLocation>checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
-          <headerLocation>checkstyle/java.header</headerLocation>
-          <propertyExpansion>samedir=</propertyExpansion>
-          <encoding>UTF-8</encoding>
-          <consoleOutput>true</consoleOutput>
-          <includeTestSourceDirectory>true</includeTestSourceDirectory>
-          <linkXRef>true</linkXRef>
-
-          <!-- TODO soon - enable these failure modes -->
-          <failsOnError>false</failsOnError>
-          <failOnViolation>false</failOnViolation>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>verify</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <!-- Configure the jar plugin -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
-        <configuration>
-          <outputDirectory>${packageOutputDirectory}</outputDirectory>
-        </configuration>
-      </plugin>
-
-      <!-- Configure the javadoc plugin -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.1.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
-        <executions>
-          <execution>
-            <id>attach-javadocs</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-            <configuration>
-              <jarOutputDirectory>${packageOutputDirectory}</jarOutputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Configure the source plugin -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>3.0.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-source-plugin;external_dependency} -->
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${packageOutputDirectory}</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Copy the pom file to output -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version> <!-- {x-version-update;org.apache.maven.plugins:maven-antrun-plugin;external_dependency} -->
-        <executions>
-          <execution>
-            <id>copy</id>
-            <phase>package</phase>
-            <configuration>
-              <target>
-                <copy file="${project.pomFile}" tofile="${packageOutputDirectory}/${project.build.finalName}.pom"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Allows the sample sources to be built during test-compile phase. -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.0.0</version> <!-- {x-version-update;org.codehaus.mojo:build-helper-maven-plugin;external_dependency} -->
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <!--
-     By default we build against our baseline, Java 8, but we also want to ensure compatibility
-     against the latest Java LTS release, currently Java 11. We therefore have two profiles:
-       * The default 'java8', which will perform a build using Java 8 as its target.
-       * The non-default 'java-lts' profile, which will build against the current LTS release.
-   -->
-    <profile>
-      <id>java8</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-        <property>
-          <name>!java-lts</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.8.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
-            <configuration>
-              <source>1.8</source>
-              <target>1.8</target>
-              <showWarnings>true</showWarnings>
-              <showDeprecation>true</showDeprecation>
-              <compilerArgument>-Xlint:all</compilerArgument>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>java-lts</id>
-      <activation>
-        <property>
-          <name>java-lts</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.8.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
-            <configuration>
-              <source>11</source>
-              <target>11</target>
-              <showWarnings>true</showWarnings>
-              <showDeprecation>true</showDeprecation>
-              <compilerArgument>-Xlint:all</compilerArgument>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <!-- Customise the javadoc plugin to not include module directories in links. We don't
-         currently use modules, so search results were being directed to an 'undefined'
-         directory (for an 'undefined' module). This no-module-directories flag fixes
-         this, but it is only required for JDK 9+ -->
-    <profile>
-      <id>javadoc-no-modules-fix</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.1.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
-            <configuration>
-              <additionalJOption>--no-module-directories</additionalJOption>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>template-module</id>
-      <activation>
-        <property>
-          <name>include-template</name>
-        </property>
-      </activation>
-      <modules>
-        <module>./sdk/template/azure-sdk-template</module>
-      </modules>
-    </profile>
-  </profiles>
-
+  <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
-    <module>./pom.client.xml</module>
-    <module>./pom.data.xml</module>
-    <module>./pom.management.xml</module>
+    <module>sdk/appconfiguration</module>
+    <module>sdk/authorization</module>
+    <module>sdk/batch</module>
+    <module>sdk/core</module>
+    <module>sdk/cosmos</module>
+    <module>sdk/cognitiveservices</module>
+    <module>sdk/eventgrid</module>
+    <module>sdk/eventhubs</module>
+    <module>sdk/identity</module>
+    <module>sdk/keyvault</module>
+    <module>sdk/loganalytics</module>
+    <module>sdk/mediaservices</module>
+    <module>common/perf-test-core</module>
+    <module>sdk/search</module>
+    <module>sdk/servicebus</module>
+    <module>sdk/storage</module>
   </modules>
 </project>
diff --git a/sdk/appconfiguration/pom.service.xml b/sdk/appconfiguration/pom.xml
similarity index 66%
rename from sdk/appconfiguration/pom.service.xml
rename to sdk/appconfiguration/pom.xml
index 921cee0628142..dbb6501612fb2 100644
--- a/sdk/appconfiguration/pom.service.xml
+++ b/sdk/appconfiguration/pom.xml
@@ -9,13 +9,6 @@
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
-    <!-- NOTE: Commenting out because we should now be binary composed.
-    -->
-    <module>../core/azure-core</module>
-    <module>../core/azure-core-test</module>
-    <module>../core/azure-core-http-netty</module>
-    <module>../core/azure-core-http-okhttp</module>
-    <module>../identity/azure-identity</module>
     <module>azure-data-appconfiguration</module>
   </modules>
 </project>
diff --git a/sdk/applicationinsights/pom.xml b/sdk/applicationinsights/pom.xml
new file mode 100644
index 0000000000000..dbb6501612fb2
--- /dev/null
+++ b/sdk/applicationinsights/pom.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-appconfiguration-service</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0.0</version><!-- Need not change for every release-->
+  <modules>
+    <module>azure-data-appconfiguration</module>
+  </modules>
+</project>
diff --git a/sdk/authorization/pom.service.xml b/sdk/authorization/pom.xml
similarity index 100%
rename from sdk/authorization/pom.service.xml
rename to sdk/authorization/pom.xml
diff --git a/sdk/batch/pom.service.xml b/sdk/batch/pom.xml
similarity index 100%
rename from sdk/batch/pom.service.xml
rename to sdk/batch/pom.xml
diff --git a/sdk/cognitiveservices/pom.service.xml b/sdk/cognitiveservices/pom.xml
similarity index 100%
rename from sdk/cognitiveservices/pom.service.xml
rename to sdk/cognitiveservices/pom.xml
diff --git a/sdk/search/pom.service.xml b/sdk/core/pom.xml
similarity index 58%
rename from sdk/search/pom.service.xml
rename to sdk/core/pom.xml
index 085abd47628de..143067b62c4e0 100644
--- a/sdk/search/pom.service.xml
+++ b/sdk/core/pom.xml
@@ -5,16 +5,15 @@
          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-search-service-parent</artifactId>
+  <artifactId>azure-core-service</artifactId>
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
-    <module>../core/azure-core</module>
-    <module>../core/azure-core-test</module>
-    <module>../core/azure-core-http-netty</module>
-    <module>../identity/azure-identity</module>
-    <module>../storage/azure-storage-common</module>
-    <module>../storage/azure-storage-blob</module>
-    <module>azure-search</module>
+    <module>azure-core</module>
+    <module>azure-core-amqp</module>
+    <module>azure-core-http-netty</module>
+    <module>azure-core-http-okhttp</module>
+    <module>azure-core-test</module>
+    <module>azure-core-tracing-opentelemetry</module>
   </modules>
 </project>
diff --git a/sdk/cosmos/pom.service.xml b/sdk/cosmos/pom.xml
similarity index 94%
rename from sdk/cosmos/pom.service.xml
rename to sdk/cosmos/pom.xml
index 06d12d53f008c..28d36830a6dae 100644
--- a/sdk/cosmos/pom.service.xml
+++ b/sdk/cosmos/pom.xml
@@ -9,7 +9,6 @@
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
-    <module>../core/azure-core</module>
     <module>azure-cosmos</module>
     <module>azure-cosmos-benchmark</module>
     <module>azure-cosmos-examples</module>
diff --git a/sdk/eventgrid/pom.service.xml b/sdk/eventgrid/pom.xml
similarity index 100%
rename from sdk/eventgrid/pom.service.xml
rename to sdk/eventgrid/pom.xml
diff --git a/sdk/eventhubs/pom.service.xml b/sdk/eventhubs/pom.service.xml
deleted file mode 100644
index 13f62f3717377..0000000000000
--- a/sdk/eventhubs/pom.service.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- 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-eventhubs-service</artifactId>
-  <packaging>pom</packaging>
-  <version>1.0.0</version>  <!-- Need not change for every release-->
-  <profiles>
-    <profile>
-      <id>data</id>
-      <activation>
-        <property>
-          <name>env.SDKTYPE</name>
-          <value>data</value>
-        </property>
-      </activation>
-      <modules>
-        <module>microsoft-azure-eventhubs</module>
-        <module>microsoft-azure-eventhubs-eph</module>
-        <module>microsoft-azure-eventhubs-extensions</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>client</id>
-      <activation>
-        <property>
-          <name>env.SDKTYPE</name>
-          <value>!data</value>
-        </property>
-      </activation>
-      <modules>
-        <module>../core/azure-core</module>
-        <module>../core/azure-core-test</module>
-        <module>../core/azure-core-http-netty</module>
-        <module>../identity/azure-identity</module>
-        <module>../core/azure-core-amqp</module>
-        <module>../storage/azure-storage-common</module>
-        <module>../storage/azure-storage-blob</module>
-        <module>azure-messaging-eventhubs</module>
-        <module>azure-messaging-eventhubs-checkpointstore-blob</module>
-      </modules>
-    </profile>
-  </profiles>
-</project>
diff --git a/sdk/eventhubs/pom.xml b/sdk/eventhubs/pom.xml
new file mode 100644
index 0000000000000..1fa460214c9a6
--- /dev/null
+++ b/sdk/eventhubs/pom.xml
@@ -0,0 +1,17 @@
+<!-- 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-eventhubs-service</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0.0</version>  <!-- Need not change for every release-->
+  <modules>
+    <module>microsoft-azure-eventhubs</module>
+    <module>microsoft-azure-eventhubs-eph</module>
+    <module>microsoft-azure-eventhubs-extensions</module>
+    <module>azure-messaging-eventhubs</module>
+    <module>azure-messaging-eventhubs-checkpointstore-blob</module>
+  </modules>
+</project>
diff --git a/sdk/identity/pom.service.xml b/sdk/identity/pom.xml
similarity index 83%
rename from sdk/identity/pom.service.xml
rename to sdk/identity/pom.xml
index c37d14e46a057..b9f57fa47d469 100644
--- a/sdk/identity/pom.service.xml
+++ b/sdk/identity/pom.xml
@@ -11,9 +11,6 @@
   <modules>
     <!-- NOTE: Commenting out becuase we are now binary composed.
     -->
-    <module>../core/azure-core</module>
-    <module>../core/azure-core-http-netty</module>
-    <module>../core/azure-core-test</module>
     <module>azure-identity</module>
   </modules>
 </project>
diff --git a/sdk/keyvault/pom.service.xml b/sdk/keyvault/pom.service.xml
deleted file mode 100644
index 43c5f66b4562f..0000000000000
--- a/sdk/keyvault/pom.service.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<!-- 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-keyvault-service</artifactId>
-  <packaging>pom</packaging>
-
-  <version>1.0.0</version>  <!-- Need not change for every release-->
-  <profiles>
-    <profile>
-      <id>data</id>
-      <activation>
-        <property>
-          <name>env.SDKTYPE</name>
-          <value>data</value>
-        </property>
-      </activation>
-      <modules>
-        <module>microsoft-azure-keyvault</module>
-        <module>microsoft-azure-keyvault-complete</module>
-        <module>microsoft-azure-keyvault-core</module>
-        <module>microsoft-azure-keyvault-cryptography</module>
-        <module>microsoft-azure-keyvault-extensions</module>
-        <module>microsoft-azure-keyvault-test</module>
-        <module>microsoft-azure-keyvault-webkey</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>client</id>
-      <activation>
-        <property>
-          <name>env.SDKTYPE</name>
-          <value>!data</value>
-        </property>
-      </activation>
-      <modules>
-      <!-- NOTE: Commenting out because we should now be binary composed.
-        -->
-        <module>../core/azure-core</module>
-        <module>../core/azure-core-test</module>
-        <module>../core/azure-core-http-netty</module>
-        <module>../core/azure-core-http-okhttp</module>
-        <module>../identity/azure-identity</module>
-        <module>azure-security-keyvault-certificates</module>
-        <module>azure-security-keyvault-keys</module>
-        <module>azure-security-keyvault-secrets</module>
-      </modules>
-    </profile>
-  </profiles>
-</project>
diff --git a/sdk/keyvault/pom.xml b/sdk/keyvault/pom.xml
new file mode 100644
index 0000000000000..76c6b3ec95911
--- /dev/null
+++ b/sdk/keyvault/pom.xml
@@ -0,0 +1,23 @@
+<!-- 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-keyvault-service</artifactId>
+  <packaging>pom</packaging>
+
+  <version>1.0.0</version>  <!-- Need not change for every release-->
+  <modules>
+    <module>microsoft-azure-keyvault</module>
+    <module>microsoft-azure-keyvault-complete</module>
+    <module>microsoft-azure-keyvault-core</module>
+    <module>microsoft-azure-keyvault-cryptography</module>
+    <module>microsoft-azure-keyvault-extensions</module>
+    <module>microsoft-azure-keyvault-test</module>
+    <module>microsoft-azure-keyvault-webkey</module>
+    <module>azure-security-keyvault-certificates</module>
+    <module>azure-security-keyvault-keys</module>
+    <module>azure-security-keyvault-secrets</module>
+  </modules>
+</project>
diff --git a/sdk/loganalytics/pom.service.xml b/sdk/loganalytics/pom.xml
similarity index 100%
rename from sdk/loganalytics/pom.service.xml
rename to sdk/loganalytics/pom.xml
diff --git a/sdk/mediaservices/pom.service.xml b/sdk/mediaservices/pom.xml
similarity index 100%
rename from sdk/mediaservices/pom.service.xml
rename to sdk/mediaservices/pom.xml
diff --git a/sdk/core/pom.service.xml b/sdk/search/pom.xml
similarity index 85%
rename from sdk/core/pom.service.xml
rename to sdk/search/pom.xml
index 3a4ec25b5af3e..e92814367ba63 100644
--- a/sdk/core/pom.service.xml
+++ b/sdk/search/pom.xml
@@ -5,10 +5,10 @@
          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-core-service</artifactId>
+  <artifactId>azure-search-service</artifactId>
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
-    <module>../../pom.client.xml</module>
+    <module>azure-search</module>
   </modules>
 </project>
diff --git a/sdk/servicebus/pom.service.xml b/sdk/servicebus/pom.service.xml
deleted file mode 100644
index 8fc7725b41841..0000000000000
--- a/sdk/servicebus/pom.service.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- 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-servicebus-service</artifactId>
-  <packaging>pom</packaging>
-  <version>1.0.0</version><!-- Need not change for every release-->
-  <profiles>
-    <profile>
-      <id>data</id>
-      <activation>
-        <property>
-          <name>env.SDKTYPE</name>
-          <value>data</value>
-        </property>
-      </activation>
-      <modules>
-        <module>microsoft-azure-servicebus</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>client</id>
-      <activation>
-        <property>
-          <name>env.SDKTYPE</name>
-          <value>!data</value>
-        </property>
-      </activation>
-      <modules>
-        <module>../core/azure-core</module>
-        <module>../core/azure-core-amqp</module>
-        <module>../core/azure-core-http-netty</module>
-        <module>../core/azure-core-test</module>
-        <module>../identity/azure-identity</module>
-        <module>azure-messaging-servicebus</module>
-      </modules>
-    </profile>
-  </profiles>
-</project>
diff --git a/sdk/servicebus/pom.xml b/sdk/servicebus/pom.xml
new file mode 100644
index 0000000000000..3e8b922255978
--- /dev/null
+++ b/sdk/servicebus/pom.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-servicebus-service</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0.0</version>  <!-- Need not change for every release-->
+  <modules>
+    <module>microsoft-azure-servicebus</module>
+    <module>azure-messaging-servicebus</module>
+  </modules>
+</project>
diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml
index 28b114457bb5c..1556c9916c210 100644
--- a/sdk/storage/azure-storage-blob/pom.xml
+++ b/sdk/storage/azure-storage-blob/pom.xml
@@ -77,7 +77,6 @@
       <version>3.0.2</version> <!-- {x-version-update;com.google.code.findbugs:jsr305;external_dependency} -->
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>
diff --git a/sdk/storage/pom.service.xml b/sdk/storage/pom.xml
similarity index 82%
rename from sdk/storage/pom.service.xml
rename to sdk/storage/pom.xml
index 375257dbaa287..291c6460c8693 100644
--- a/sdk/storage/pom.service.xml
+++ b/sdk/storage/pom.xml
@@ -12,11 +12,6 @@
 <!--   <module>microsoft-azure-storage-blob</module>-->
     <!-- NOTE: Commenting out because these should now be binary composed.
     -->
-    <module>../../common/perf-test-core</module>
-    <module>../core/azure-core</module>
-    <module>../core/azure-core-test</module>
-    <module>../core/azure-core-http-netty</module>
-    <module>../identity/azure-identity</module>
     <module>azure-storage-common</module>
     <module>azure-storage-blob</module>
     <module>azure-storage-blob-batch</module>