diff --git a/dist/unshimmed-common-from-spark311.txt b/dist/unshimmed-common-from-spark311.txt
index a9dd2155237..772360b1b37 100644
--- a/dist/unshimmed-common-from-spark311.txt
+++ b/dist/unshimmed-common-from-spark311.txt
@@ -1,12 +1,8 @@
 META-INF/DEPENDENCIES
 META-INF/LICENSE
 META-INF/NOTICE
-com/nvidia/spark/ExclusiveModeGpuDiscoveryPlugin*
 com/nvidia/spark/GpuCachedBatchSerializer*
 com/nvidia/spark/ParquetCachedBatchSerializer*
-com/nvidia/spark/RapidsUDF*
-com/nvidia/spark/Retryable*
-com/nvidia/spark/SQLPlugin*
 com/nvidia/spark/rapids/ColumnarRdd*
 com/nvidia/spark/rapids/GpuColumnVectorUtils*
 com/nvidia/spark/rapids/ExplainPlan.class
@@ -17,7 +13,6 @@ com/nvidia/spark/rapids/SQLExecPlugin*
 com/nvidia/spark/rapids/ShimLoaderTemp*
 com/nvidia/spark/rapids/SparkShims*
 com/nvidia/spark/rapids/optimizer/SQLOptimizerPlugin*
-com/nvidia/spark/udf/Plugin*
 org/apache/spark/sql/rapids/AdaptiveSparkPlanHelperShim*
 org/apache/spark/sql/rapids/ExecutionPlanCaptureCallback*
 rapids/*.py
diff --git a/sql-plugin/src/main/java/com/nvidia/spark/RapidsUDF.java b/sql-plugin-api/src/main/java/com/nvidia/spark/RapidsUDF.java
similarity index 100%
rename from sql-plugin/src/main/java/com/nvidia/spark/RapidsUDF.java
rename to sql-plugin-api/src/main/java/com/nvidia/spark/RapidsUDF.java
diff --git a/sql-plugin/src/main/java/com/nvidia/spark/Retryable.java b/sql-plugin-api/src/main/java/com/nvidia/spark/Retryable.java
similarity index 100%
rename from sql-plugin/src/main/java/com/nvidia/spark/Retryable.java
rename to sql-plugin-api/src/main/java/com/nvidia/spark/Retryable.java
diff --git a/sql-plugin/src/main/scala/com/nvidia/spark/ExclusiveModeGpuDiscoveryPlugin.scala b/sql-plugin-api/src/main/scala/com/nvidia/spark/ExclusiveModeGpuDiscoveryPlugin.scala
similarity index 100%
rename from sql-plugin/src/main/scala/com/nvidia/spark/ExclusiveModeGpuDiscoveryPlugin.scala
rename to sql-plugin-api/src/main/scala/com/nvidia/spark/ExclusiveModeGpuDiscoveryPlugin.scala
diff --git a/sql-plugin/src/main/scala/com/nvidia/spark/SQLPlugin.scala b/sql-plugin-api/src/main/scala/com/nvidia/spark/SQLPlugin.scala
similarity index 100%
rename from sql-plugin/src/main/scala/com/nvidia/spark/SQLPlugin.scala
rename to sql-plugin-api/src/main/scala/com/nvidia/spark/SQLPlugin.scala
diff --git a/udf-compiler/src/main/scala/com/nvidia/spark/udf/Plugin.scala b/sql-plugin-api/src/main/scala/com/nvidia/spark/udf/Plugin.scala
similarity index 100%
rename from udf-compiler/src/main/scala/com/nvidia/spark/udf/Plugin.scala
rename to sql-plugin-api/src/main/scala/com/nvidia/spark/udf/Plugin.scala