diff --git a/src/csharp/Microsoft.Spark.E2ETest/SparkFixture.cs b/src/csharp/Microsoft.Spark.E2ETest/SparkFixture.cs
index 6d8dadbac..78d66cd44 100644
--- a/src/csharp/Microsoft.Spark.E2ETest/SparkFixture.cs
+++ b/src/csharp/Microsoft.Spark.E2ETest/SparkFixture.cs
@@ -150,7 +150,8 @@ private void BuildSparkCmd(out string filename, out string args)
             string scalaDir = Path.Combine(curDir, "..", "..", "..", "..", "..", "src", "scala");
             string jarDir = Path.Combine(scalaDir, jarPrefix, "target");
             string assemblyVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString(3);
-            string jar = Path.Combine(jarDir, $"{jarPrefix}-{assemblyVersion}.jar");
+            string scalaVersion = (SparkSettings.Version.Major == 3) ? "2.12" : "2.11";
+            string jar = Path.Combine(jarDir, $"{jarPrefix}_{scalaVersion}-{assemblyVersion}.jar");
 
             if (!File.Exists(jar))
             {
@@ -180,7 +181,7 @@ private void BuildSparkCmd(out string filename, out string args)
         private string GetJarPrefix()
         {
             Version sparkVersion = SparkSettings.Version;
-            return $"microsoft-spark-{sparkVersion.Major}.{sparkVersion.Minor}.x";
+            return $"microsoft-spark-{sparkVersion.Major}-{sparkVersion.Minor}";
         }
     }
 
diff --git a/src/scala/microsoft-spark-2.3.x/pom.xml b/src/scala/microsoft-spark-2-3/pom.xml
similarity index 97%
rename from src/scala/microsoft-spark-2.3.x/pom.xml
rename to src/scala/microsoft-spark-2-3/pom.xml
index c7d4e83b6..a256b9b0d 100644
--- a/src/scala/microsoft-spark-2.3.x/pom.xml
+++ b/src/scala/microsoft-spark-2-3/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>microsoft-spark</artifactId>
     <version>${microsoft-spark.version}</version>
   </parent>
-  <artifactId>microsoft-spark-2.3.x</artifactId>
+  <artifactId>microsoft-spark-2-3_2.11</artifactId>
   <inceptionYear>2019</inceptionYear>
   <properties>
     <encoding>UTF-8</encoding>
diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/CallbackClient.scala b/src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/CallbackClient.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/CallbackClient.scala
rename to src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/CallbackClient.scala
diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/CallbackConnection.scala b/src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/CallbackConnection.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/CallbackConnection.scala
rename to src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/CallbackConnection.scala
diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackend.scala b/src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/DotnetBackend.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackend.scala
rename to src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/DotnetBackend.scala
diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala b/src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala
rename to src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala
diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/DotnetException.scala b/src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/DotnetException.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/DotnetException.scala
rename to src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/DotnetException.scala
diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/DotnetRDD.scala b/src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/DotnetRDD.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/DotnetRDD.scala
rename to src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/DotnetRDD.scala
diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/JvmBridgeUtils.scala b/src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/JvmBridgeUtils.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/JvmBridgeUtils.scala
rename to src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/JvmBridgeUtils.scala
diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/SerDe.scala b/src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/SerDe.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/SerDe.scala
rename to src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/SerDe.scala
diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/ThreadPool.scala b/src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/ThreadPool.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/ThreadPool.scala
rename to src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/api/dotnet/ThreadPool.scala
diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/deploy/dotnet/DotnetRunner.scala b/src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/deploy/dotnet/DotnetRunner.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/deploy/dotnet/DotnetRunner.scala
rename to src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/deploy/dotnet/DotnetRunner.scala
diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/internal/config/Dotnet.scala b/src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/internal/config/Dotnet.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/internal/config/Dotnet.scala
rename to src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/internal/config/Dotnet.scala
diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/sql/api/dotnet/SQLUtils.scala b/src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/sql/api/dotnet/SQLUtils.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/sql/api/dotnet/SQLUtils.scala
rename to src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/sql/api/dotnet/SQLUtils.scala
diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/sql/test/TestUtils.scala b/src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/sql/test/TestUtils.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/sql/test/TestUtils.scala
rename to src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/sql/test/TestUtils.scala
diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/util/dotnet/Utils.scala b/src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/util/dotnet/Utils.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/util/dotnet/Utils.scala
rename to src/scala/microsoft-spark-2-3/src/main/scala/org/apache/spark/util/dotnet/Utils.scala
diff --git a/src/scala/microsoft-spark-2.3.x/src/test/scala/com/microsoft/scala/AppTest.scala b/src/scala/microsoft-spark-2-3/src/test/scala/com/microsoft/scala/AppTest.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.3.x/src/test/scala/com/microsoft/scala/AppTest.scala
rename to src/scala/microsoft-spark-2-3/src/test/scala/com/microsoft/scala/AppTest.scala
diff --git a/src/scala/microsoft-spark-2.4.x/pom.xml b/src/scala/microsoft-spark-2-4/pom.xml
similarity index 97%
rename from src/scala/microsoft-spark-2.4.x/pom.xml
rename to src/scala/microsoft-spark-2-4/pom.xml
index 10ce0738e..416291777 100644
--- a/src/scala/microsoft-spark-2.4.x/pom.xml
+++ b/src/scala/microsoft-spark-2-4/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>microsoft-spark</artifactId>
     <version>${microsoft-spark.version}</version>
   </parent>
-  <artifactId>microsoft-spark-2.4.x</artifactId>
+  <artifactId>microsoft-spark-2-4_2.11</artifactId>
   <inceptionYear>2019</inceptionYear>
   <properties>
     <encoding>UTF-8</encoding>
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/CallbackClient.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/CallbackClient.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/CallbackClient.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/CallbackClient.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/CallbackConnection.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/CallbackConnection.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/CallbackConnection.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/CallbackConnection.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackend.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/DotnetBackend.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackend.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/DotnetBackend.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/DotnetException.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/DotnetException.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/DotnetException.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/DotnetException.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/DotnetRDD.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/DotnetRDD.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/DotnetRDD.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/DotnetRDD.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/JvmBridgeUtils.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/JvmBridgeUtils.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/JvmBridgeUtils.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/JvmBridgeUtils.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/SerDe.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/SerDe.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/SerDe.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/SerDe.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/ThreadPool.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/ThreadPool.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/ThreadPool.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/api/dotnet/ThreadPool.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/deploy/dotnet/DotnetRunner.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/deploy/dotnet/DotnetRunner.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/deploy/dotnet/DotnetRunner.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/deploy/dotnet/DotnetRunner.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/internal/config/Dotnet.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/internal/config/Dotnet.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/internal/config/Dotnet.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/internal/config/Dotnet.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/sql/api/dotnet/DotnetForeachBatch.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/sql/api/dotnet/DotnetForeachBatch.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/sql/api/dotnet/DotnetForeachBatch.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/sql/api/dotnet/DotnetForeachBatch.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/sql/api/dotnet/SQLUtils.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/sql/api/dotnet/SQLUtils.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/sql/api/dotnet/SQLUtils.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/sql/api/dotnet/SQLUtils.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/sql/test/TestUtils.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/sql/test/TestUtils.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/sql/test/TestUtils.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/sql/test/TestUtils.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/util/dotnet/Utils.scala b/src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/util/dotnet/Utils.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/util/dotnet/Utils.scala
rename to src/scala/microsoft-spark-2-4/src/main/scala/org/apache/spark/util/dotnet/Utils.scala
diff --git a/src/scala/microsoft-spark-2.4.x/src/test/scala/com/microsoft/scala/AppTest.scala b/src/scala/microsoft-spark-2-4/src/test/scala/com/microsoft/scala/AppTest.scala
similarity index 100%
rename from src/scala/microsoft-spark-2.4.x/src/test/scala/com/microsoft/scala/AppTest.scala
rename to src/scala/microsoft-spark-2-4/src/test/scala/com/microsoft/scala/AppTest.scala
diff --git a/src/scala/microsoft-spark-3.0.x/pom.xml b/src/scala/microsoft-spark-3-0/pom.xml
similarity index 97%
rename from src/scala/microsoft-spark-3.0.x/pom.xml
rename to src/scala/microsoft-spark-3-0/pom.xml
index 179239b67..8a9e41190 100644
--- a/src/scala/microsoft-spark-3.0.x/pom.xml
+++ b/src/scala/microsoft-spark-3-0/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>microsoft-spark</artifactId>
     <version>${microsoft-spark.version}</version>
   </parent>
-  <artifactId>microsoft-spark-3.0.x</artifactId>
+  <artifactId>microsoft-spark-3-0_2.12</artifactId>
   <inceptionYear>2019</inceptionYear>
   <properties>
     <encoding>UTF-8</encoding>
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/CallbackClient.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/CallbackClient.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/CallbackClient.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/CallbackClient.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/CallbackConnection.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/CallbackConnection.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/CallbackConnection.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/CallbackConnection.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackend.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/DotnetBackend.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackend.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/DotnetBackend.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/DotnetException.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/DotnetException.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/DotnetException.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/DotnetException.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/DotnetRDD.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/DotnetRDD.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/DotnetRDD.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/DotnetRDD.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/JvmBridgeUtils.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/JvmBridgeUtils.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/JvmBridgeUtils.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/JvmBridgeUtils.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/SerDe.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/SerDe.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/SerDe.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/SerDe.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/ThreadPool.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/ThreadPool.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/ThreadPool.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/api/dotnet/ThreadPool.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/deploy/dotnet/DotnetRunner.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/deploy/dotnet/DotnetRunner.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/deploy/dotnet/DotnetRunner.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/deploy/dotnet/DotnetRunner.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/internal/config/Dotnet.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/internal/config/Dotnet.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/internal/config/Dotnet.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/internal/config/Dotnet.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/sql/api/dotnet/DotnetForeachBatch.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/sql/api/dotnet/DotnetForeachBatch.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/sql/api/dotnet/DotnetForeachBatch.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/sql/api/dotnet/DotnetForeachBatch.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/sql/api/dotnet/SQLUtils.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/sql/api/dotnet/SQLUtils.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/sql/api/dotnet/SQLUtils.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/sql/api/dotnet/SQLUtils.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/sql/test/TestUtils.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/sql/test/TestUtils.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/sql/test/TestUtils.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/sql/test/TestUtils.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/util/dotnet/Utils.scala b/src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/util/dotnet/Utils.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/util/dotnet/Utils.scala
rename to src/scala/microsoft-spark-3-0/src/main/scala/org/apache/spark/util/dotnet/Utils.scala
diff --git a/src/scala/microsoft-spark-3.0.x/src/test/scala/com/microsoft/scala/AppTest.scala b/src/scala/microsoft-spark-3-0/src/test/scala/com/microsoft/scala/AppTest.scala
similarity index 100%
rename from src/scala/microsoft-spark-3.0.x/src/test/scala/com/microsoft/scala/AppTest.scala
rename to src/scala/microsoft-spark-3-0/src/test/scala/com/microsoft/scala/AppTest.scala
diff --git a/src/scala/pom.xml b/src/scala/pom.xml
index 89254a8c4..8c20f3ad7 100644
--- a/src/scala/pom.xml
+++ b/src/scala/pom.xml
@@ -11,9 +11,9 @@
   </properties>
 
   <modules>
-    <module>microsoft-spark-2.3.x</module>
-    <module>microsoft-spark-2.4.x</module>
-    <module>microsoft-spark-3.0.x</module>
+    <module>microsoft-spark-2-3</module>
+    <module>microsoft-spark-2-4</module>
+    <module>microsoft-spark-3-0</module>
   </modules>
 
   <pluginRepositories>