diff --git a/build.gradle b/build.gradle
index dd99804b3aef..86cc53231667 100644
--- a/build.gradle
+++ b/build.gradle
@@ -986,6 +986,8 @@ if (jdkVersion == '8') {
 }
 
 project(':iceberg-spark3') {
+  apply plugin: 'scala'
+
   sourceSets {
     // Compile test source against Spark 3.1 and main classes compiled against Spark 3.0
     spark31 {
diff --git a/spark3-extensions/src/main/scala/org/apache/spark/sql/catalyst/expressions/TransformExpressions.scala b/spark3/src/main/scala/org/apache/spark/sql/catalyst/expressions/TransformExpressions.scala
similarity index 100%
rename from spark3-extensions/src/main/scala/org/apache/spark/sql/catalyst/expressions/TransformExpressions.scala
rename to spark3/src/main/scala/org/apache/spark/sql/catalyst/expressions/TransformExpressions.scala
diff --git a/spark3-extensions/src/main/scala/org/apache/spark/sql/catalyst/utils/DistributionAndOrderingUtils.scala b/spark3/src/main/scala/org/apache/spark/sql/catalyst/utils/DistributionAndOrderingUtils.scala
similarity index 100%
rename from spark3-extensions/src/main/scala/org/apache/spark/sql/catalyst/utils/DistributionAndOrderingUtils.scala
rename to spark3/src/main/scala/org/apache/spark/sql/catalyst/utils/DistributionAndOrderingUtils.scala
diff --git a/spark3-extensions/src/main/scala/org/apache/spark/sql/catalyst/utils/PlanUtils.scala b/spark3/src/main/scala/org/apache/spark/sql/catalyst/utils/PlanUtils.scala
similarity index 100%
rename from spark3-extensions/src/main/scala/org/apache/spark/sql/catalyst/utils/PlanUtils.scala
rename to spark3/src/main/scala/org/apache/spark/sql/catalyst/utils/PlanUtils.scala