diff --git a/pom.xml b/pom.xml
index 35a267f0a8e1c..d22fefd56b640 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2828,6 +2828,7 @@
                         </dependency>
                     </dependencies>
                     <configuration>
+                        <skip>true</skip>
                         <rules>
                             <requireUpperBoundDeps>
                                 <excludes combine.children="append">
@@ -2847,6 +2848,7 @@
                     <groupId>org.basepom.maven</groupId>
                     <artifactId>duplicate-finder-maven-plugin</artifactId>
                     <configuration>
+                        <skip>true</skip>
                         <ignoredClassPatterns combine.children="append">
                             <ignoredClassPattern>com.github.benmanes.caffeine.*</ignoredClassPattern>
                             <!-- Duplicate class is being brought in by commons-io & log4j-api -->
@@ -2966,6 +2968,7 @@
                     </execution>
                 </executions>
             </plugin>
+
         </plugins>
     </build>
 
@@ -3207,149 +3210,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>spark2</id>
-
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>!spark-version</name>
-                </property>
-            </activation>
-
-            <properties>
-                <dep.spark.version>2.0.2-6</dep.spark.version>
-            </properties>
-
-            <modules>
-                <module>presto-spark-classloader-spark2</module>
-            </modules>
-
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-enforcer-plugin</artifactId>
-                            <version>3.3.0</version>
-                            <dependencies>
-                                <dependency>
-                                    <groupId>org.codehaus.mojo</groupId>
-                                    <artifactId>extra-enforcer-rules</artifactId>
-                                    <version>1.6.2</version>
-                                </dependency>
-                            </dependencies>
-                            <configuration>
-                                <skip>true</skip>
-                                <rules>
-                                    <requireUpperBoundDeps>
-                                        <excludes combine.children="append">
-                                            <!-- TODO: fix this in Airlift resolver -->
-                                            <exclude>org.codehaus.plexus:plexus-utils</exclude>
-                                            <exclude>com.google.guava:guava</exclude>
-                                            <exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
-                                            <exclude>com.fasterxml.jackson.core:jackson-core</exclude>
-                                            <exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
-                                        </excludes>
-                                    </requireUpperBoundDeps>
-                                </rules>
-                            </configuration>
-                        </plugin>
-
-                        <plugin>
-                            <groupId>org.basepom.maven</groupId>
-                            <artifactId>duplicate-finder-maven-plugin</artifactId>
-                            <configuration>
-                                <skip>true</skip>
-                                <ignoredClassPatterns combine.children="append">
-                                    <ignoredClassPattern>com.github.benmanes.caffeine.*</ignoredClassPattern>
-                                    <!-- Duplicate class is being brought in by commons-io & log4j-api -->
-                                    <ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
-                                    <!-- Duplicate class is being brought in by several netty dependencies-->
-                                    <ignoredClassPattern>META-INF.versions.11.module-info</ignoredClassPattern>
-                                    <!-- Ignore duplicate classes related to lucene-core and ranger-apache -->
-                                    <ignoredClassPattern>META-INF.versions.9.org.apache.lucene.*</ignoredClassPattern>
-                                </ignoredClassPatterns>
-
-                            </configuration>
-                        </plugin>
-
-                    </plugins>
-                </pluginManagement>
-            </build>
-
-        </profile>
-        <profile>
-            <id>spark3</id>
-
-            <activation>
-                <property>
-                    <name>spark-version</name>
-                    <value>3</value>
-                </property>
-            </activation>
-
-            <properties>
-                <dep.spark.version>3.4.1-1</dep.spark.version>
-            </properties>
-
-            <modules>
-                <module>presto-spark-classloader-spark3</module>
-            </modules>
-
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-enforcer-plugin</artifactId>
-                            <version>3.3.0</version>
-                            <dependencies>
-                                <dependency>
-                                    <groupId>org.codehaus.mojo</groupId>
-                                    <artifactId>extra-enforcer-rules</artifactId>
-                                    <version>1.6.2</version>
-                                </dependency>
-                            </dependencies>
-                            <configuration>
-                                <skip>true</skip>
-                                <rules>
-                                    <requireUpperBoundDeps>
-                                        <excludes combine.children="append">
-                                            <!-- TODO: fix this in Airlift resolver -->
-                                            <exclude>org.codehaus.plexus:plexus-utils</exclude>
-                                            <exclude>com.google.guava:guava</exclude>
-                                            <exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
-                                            <exclude>com.fasterxml.jackson.core:jackson-core</exclude>
-                                            <exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
-                                        </excludes>
-                                    </requireUpperBoundDeps>
-                                </rules>
-                            </configuration>
-                        </plugin>
-
-                        <plugin>
-                            <groupId>org.basepom.maven</groupId>
-                            <artifactId>duplicate-finder-maven-plugin</artifactId>
-                            <configuration>
-                                <skip>true</skip>
-                                <ignoredClassPatterns combine.children="append">
-                                    <ignoredClassPattern>com.github.benmanes.caffeine.*</ignoredClassPattern>
-                                    <!-- Duplicate class is being brought in by commons-io & log4j-api -->
-                                    <ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
-                                    <!-- Duplicate class is being brought in by several netty dependencies-->
-                                    <ignoredClassPattern>META-INF.versions.11.module-info</ignoredClassPattern>
-                                    <!-- Ignore duplicate classes related to lucene-core and ranger-apache -->
-                                    <ignoredClassPattern>META-INF.versions.9.org.apache.lucene.*</ignoredClassPattern>
-                                </ignoredClassPatterns>
-
-                            </configuration>
-                        </plugin>
-
-                    </plugins>
-                </pluginManagement>
-            </build>
-
-        </profile>
     </profiles>
 </project>
diff --git a/presto-spark-base/pom.xml b/presto-spark-base/pom.xml
index b4fd0b206c38e..9a3f612354a0a 100644
--- a/presto-spark-base/pom.xml
+++ b/presto-spark-base/pom.xml
@@ -540,14 +540,6 @@
                     <name>!spark-version</name>
                 </property>
             </activation>
-
-            <dependencies>
-                <dependency>
-                    <groupId>com.facebook.presto</groupId>
-                    <artifactId>presto-spark-classloader-spark2</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-            </dependencies>
         </profile>
 
         <profile>
@@ -560,12 +552,11 @@
                 </property>
             </activation>
 
+            <properties>
+                <spark.binary.version.main>3</spark.binary.version.main>
+            </properties>
+
             <dependencies>
-                <dependency>
-                    <groupId>com.facebook.presto</groupId>
-                    <artifactId>presto-spark-classloader-spark3</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
 
                 <dependency>
                     <groupId>com.facebook.presto.spark</groupId>
diff --git a/presto-spark-classloader-interface/pom.xml b/presto-spark-classloader-interface/pom.xml
index 8ff7dd7d2e464..d8334a063185c 100644
--- a/presto-spark-classloader-interface/pom.xml
+++ b/presto-spark-classloader-interface/pom.xml
@@ -13,6 +13,7 @@
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
         <air.check.skip-modernizer>true</air.check.skip-modernizer>
+        <spark.binary.version.main>2</spark.binary.version.main>
     </properties>
 
     <dependencies>
@@ -33,6 +34,31 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <outputDirectory>target/java-spark${spark.binary.version.main}/classes</outputDirectory>
+        <testOutputDirectory>target/java-spark${spark.binary.version.main}/test-classes</testOutputDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/java-spark${spark.binary.version.main}</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
         <profile>
             <id>spark2</id>
@@ -44,13 +70,62 @@
                 </property>
             </activation>
 
-            <dependencies>
-                <dependency>
-                    <groupId>com.facebook.presto</groupId>
-                    <artifactId>presto-spark-classloader-spark2</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-            </dependencies>
+            <properties>
+                <dep.spark.version>2.0.2-6</dep.spark.version>
+            </properties>
+
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-enforcer-plugin</artifactId>
+                            <version>3.3.0</version>
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.codehaus.mojo</groupId>
+                                    <artifactId>extra-enforcer-rules</artifactId>
+                                    <version>1.6.2</version>
+                                </dependency>
+                            </dependencies>
+                            <configuration>
+                                <skip>true</skip>
+                                <rules>
+                                    <requireUpperBoundDeps>
+                                        <excludes combine.children="append">
+                                            <!-- TODO: fix this in Airlift resolver -->
+                                            <exclude>org.codehaus.plexus:plexus-utils</exclude>
+                                            <exclude>com.google.guava:guava</exclude>
+                                            <exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
+                                            <exclude>com.fasterxml.jackson.core:jackson-core</exclude>
+                                            <exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
+                                        </excludes>
+                                    </requireUpperBoundDeps>
+                                </rules>
+                            </configuration>
+                        </plugin>
+
+                        <plugin>
+                            <groupId>org.basepom.maven</groupId>
+                            <artifactId>duplicate-finder-maven-plugin</artifactId>
+                            <configuration>
+                                <skip>true</skip>
+                                <ignoredClassPatterns combine.children="append">
+                                    <ignoredClassPattern>com.github.benmanes.caffeine.*</ignoredClassPattern>
+                                    <!-- Duplicate class is being brought in by commons-io & log4j-api -->
+                                    <ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
+                                    <!-- Duplicate class is being brought in by several netty dependencies-->
+                                    <ignoredClassPattern>META-INF.versions.11.module-info</ignoredClassPattern>
+                                    <!-- Ignore duplicate classes related to lucene-core and ranger-apache -->
+                                    <ignoredClassPattern>META-INF.versions.9.org.apache.lucene.*</ignoredClassPattern>
+                                </ignoredClassPatterns>
+
+                            </configuration>
+                        </plugin>
+
+                    </plugins>
+                </pluginManagement>
+            </build>
 
         </profile>
         <profile>
@@ -63,12 +138,12 @@
                 </property>
             </activation>
 
+            <properties>
+                <spark.binary.version.main>3</spark.binary.version.main>
+                <dep.spark.version>3.4.1-1</dep.spark.version>
+            </properties>
+
             <dependencies>
-                <dependency>
-                    <groupId>com.facebook.presto</groupId>
-                    <artifactId>presto-spark-classloader-spark3</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
                 <dependency>
                     <groupId>org.scala-lang</groupId>
                     <artifactId>scala-library</artifactId>
@@ -76,6 +151,59 @@
                 </dependency>
             </dependencies>
 
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-enforcer-plugin</artifactId>
+                            <version>3.3.0</version>
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.codehaus.mojo</groupId>
+                                    <artifactId>extra-enforcer-rules</artifactId>
+                                    <version>1.6.2</version>
+                                </dependency>
+                            </dependencies>
+                            <configuration>
+                                <skip>true</skip>
+                                <rules>
+                                    <requireUpperBoundDeps>
+                                        <excludes combine.children="append">
+                                            <!-- TODO: fix this in Airlift resolver -->
+                                            <exclude>org.codehaus.plexus:plexus-utils</exclude>
+                                            <exclude>com.google.guava:guava</exclude>
+                                            <exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
+                                            <exclude>com.fasterxml.jackson.core:jackson-core</exclude>
+                                            <exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
+                                        </excludes>
+                                    </requireUpperBoundDeps>
+                                </rules>
+                            </configuration>
+                        </plugin>
+
+                        <plugin>
+                            <groupId>org.basepom.maven</groupId>
+                            <artifactId>duplicate-finder-maven-plugin</artifactId>
+                            <configuration>
+                                <skip>true</skip>
+                                <ignoredClassPatterns combine.children="append">
+                                    <ignoredClassPattern>com.github.benmanes.caffeine.*</ignoredClassPattern>
+                                    <!-- Duplicate class is being brought in by commons-io & log4j-api -->
+                                    <ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
+                                    <!-- Duplicate class is being brought in by several netty dependencies-->
+                                    <ignoredClassPattern>META-INF.versions.11.module-info</ignoredClassPattern>
+                                    <!-- Ignore duplicate classes related to lucene-core and ranger-apache -->
+                                    <ignoredClassPattern>META-INF.versions.9.org.apache.lucene.*</ignoredClassPattern>
+                                </ignoredClassPatterns>
+
+                            </configuration>
+                        </plugin>
+
+                    </plugins>
+                </pluginManagement>
+            </build>
+
         </profile>
     </profiles>
 
diff --git a/presto-spark-classloader-spark2/src/main/java/com/facebook/presto/spark/classloader_interface/MutablePartitionId.java b/presto-spark-classloader-interface/src/main/java-spark2/com.facebook.presto.spark.classloader_interface/MutablePartitionId.java
similarity index 100%
rename from presto-spark-classloader-spark2/src/main/java/com/facebook/presto/spark/classloader_interface/MutablePartitionId.java
rename to presto-spark-classloader-interface/src/main/java-spark2/com.facebook.presto.spark.classloader_interface/MutablePartitionId.java
diff --git a/presto-spark-classloader-spark2/src/main/java/com/facebook/presto/spark/classloader_interface/MutablePartitionIdOrdering.java b/presto-spark-classloader-interface/src/main/java-spark2/com.facebook.presto.spark.classloader_interface/MutablePartitionIdOrdering.java
similarity index 100%
rename from presto-spark-classloader-spark2/src/main/java/com/facebook/presto/spark/classloader_interface/MutablePartitionIdOrdering.java
rename to presto-spark-classloader-interface/src/main/java-spark2/com.facebook.presto.spark.classloader_interface/MutablePartitionIdOrdering.java
diff --git a/presto-spark-classloader-spark2/src/main/java/com/facebook/presto/spark/classloader_interface/PrestoSparkNativeExecutionShuffleManager.java b/presto-spark-classloader-interface/src/main/java-spark2/com.facebook.presto.spark.classloader_interface/PrestoSparkNativeExecutionShuffleManager.java
similarity index 100%
rename from presto-spark-classloader-spark2/src/main/java/com/facebook/presto/spark/classloader_interface/PrestoSparkNativeExecutionShuffleManager.java
rename to presto-spark-classloader-interface/src/main/java-spark2/com.facebook.presto.spark.classloader_interface/PrestoSparkNativeExecutionShuffleManager.java
diff --git a/presto-spark-classloader-spark2/src/main/java/com/facebook/presto/spark/classloader_interface/PrestoSparkUtils.java b/presto-spark-classloader-interface/src/main/java-spark2/com.facebook.presto.spark.classloader_interface/PrestoSparkUtils.java
similarity index 100%
rename from presto-spark-classloader-spark2/src/main/java/com/facebook/presto/spark/classloader_interface/PrestoSparkUtils.java
rename to presto-spark-classloader-interface/src/main/java-spark2/com.facebook.presto.spark.classloader_interface/PrestoSparkUtils.java
diff --git a/presto-spark-classloader-spark2/src/main/java/com/facebook/presto/spark/classloader_interface/ScalaUtils.java b/presto-spark-classloader-interface/src/main/java-spark2/com.facebook.presto.spark.classloader_interface/ScalaUtils.java
similarity index 100%
rename from presto-spark-classloader-spark2/src/main/java/com/facebook/presto/spark/classloader_interface/ScalaUtils.java
rename to presto-spark-classloader-interface/src/main/java-spark2/com.facebook.presto.spark.classloader_interface/ScalaUtils.java
diff --git a/presto-spark-classloader-spark3/src/main/java/com/facebook/presto/spark/classloader_interface/MutablePartitionId.java b/presto-spark-classloader-interface/src/main/java-spark3/com.facebook.presto.spark.classloader_interface/MutablePartitionId.java
similarity index 100%
rename from presto-spark-classloader-spark3/src/main/java/com/facebook/presto/spark/classloader_interface/MutablePartitionId.java
rename to presto-spark-classloader-interface/src/main/java-spark3/com.facebook.presto.spark.classloader_interface/MutablePartitionId.java
diff --git a/presto-spark-classloader-spark3/src/main/java/com/facebook/presto/spark/classloader_interface/MutablePartitionIdOrdering.java b/presto-spark-classloader-interface/src/main/java-spark3/com.facebook.presto.spark.classloader_interface/MutablePartitionIdOrdering.java
similarity index 100%
rename from presto-spark-classloader-spark3/src/main/java/com/facebook/presto/spark/classloader_interface/MutablePartitionIdOrdering.java
rename to presto-spark-classloader-interface/src/main/java-spark3/com.facebook.presto.spark.classloader_interface/MutablePartitionIdOrdering.java
diff --git a/presto-spark-classloader-spark3/src/main/java/com/facebook/presto/spark/classloader_interface/PrestoSparkNativeExecutionShuffleManager.java b/presto-spark-classloader-interface/src/main/java-spark3/com.facebook.presto.spark.classloader_interface/PrestoSparkNativeExecutionShuffleManager.java
similarity index 100%
rename from presto-spark-classloader-spark3/src/main/java/com/facebook/presto/spark/classloader_interface/PrestoSparkNativeExecutionShuffleManager.java
rename to presto-spark-classloader-interface/src/main/java-spark3/com.facebook.presto.spark.classloader_interface/PrestoSparkNativeExecutionShuffleManager.java
diff --git a/presto-spark-classloader-spark3/src/main/java/com/facebook/presto/spark/classloader_interface/PrestoSparkUtils.java b/presto-spark-classloader-interface/src/main/java-spark3/com.facebook.presto.spark.classloader_interface/PrestoSparkUtils.java
similarity index 100%
rename from presto-spark-classloader-spark3/src/main/java/com/facebook/presto/spark/classloader_interface/PrestoSparkUtils.java
rename to presto-spark-classloader-interface/src/main/java-spark3/com.facebook.presto.spark.classloader_interface/PrestoSparkUtils.java
diff --git a/presto-spark-classloader-spark3/src/main/java/com/facebook/presto/spark/classloader_interface/ScalaUtils.java b/presto-spark-classloader-interface/src/main/java-spark3/com.facebook.presto.spark.classloader_interface/ScalaUtils.java
similarity index 100%
rename from presto-spark-classloader-spark3/src/main/java/com/facebook/presto/spark/classloader_interface/ScalaUtils.java
rename to presto-spark-classloader-interface/src/main/java-spark3/com.facebook.presto.spark.classloader_interface/ScalaUtils.java
diff --git a/presto-spark-classloader-spark2/pom.xml b/presto-spark-classloader-spark2/pom.xml
deleted file mode 100644
index 0abd6b7178d44..0000000000000
--- a/presto-spark-classloader-spark2/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-  <parent>
-    <artifactId>presto-root</artifactId>
-    <groupId>com.facebook.presto</groupId>
-    <version>0.297-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>presto-spark-classloader-spark2</artifactId>
-  <name>presto-spark-classloader-spark2</name>
-
-  <properties>
-    <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-  </properties>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>com.facebook.presto.spark</groupId>
-      <artifactId>spark-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-
-  </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/presto-spark-classloader-spark3/pom.xml b/presto-spark-classloader-spark3/pom.xml
deleted file mode 100644
index aba2bf8725868..0000000000000
--- a/presto-spark-classloader-spark3/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-  <parent>
-    <artifactId>presto-root</artifactId>
-    <groupId>com.facebook.presto</groupId>
-    <version>0.296-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>presto-spark-classloader-spark3</artifactId>
-  <name>presto-spark-classloader-spark3</name>
-
-  <properties>
-    <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-  </properties>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.facebook.presto.spark</groupId>
-      <artifactId>spark-core</artifactId>
-      <version>3.4.1-1</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-library</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-  </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/presto-spark-launcher/pom.xml b/presto-spark-launcher/pom.xml
index 0cdc2ad84bade..50f78952e91d9 100644
--- a/presto-spark-launcher/pom.xml
+++ b/presto-spark-launcher/pom.xml
@@ -62,6 +62,10 @@
                 </property>
             </activation>
 
+            <properties>
+                <spark.binary.version.main>3</spark.binary.version.main>
+            </properties>
+
             <dependencies>
                 <dependency>
                     <groupId>com.facebook.presto.spark</groupId>