diff --git a/dev/kyuubi-codecov/pom.xml b/dev/kyuubi-codecov/pom.xml
index a35cde9b2..fb5a8e35e 100644
--- a/dev/kyuubi-codecov/pom.xml
+++ b/dev/kyuubi-codecov/pom.xml
@@ -64,7 +64,7 @@
 
         <dependency>
             <groupId>org.apache.kyuubi</groupId>
-            <artifactId>kyuubi-main</artifactId>
+            <artifactId>kyuubi-server</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/kyuubi-assembly/pom.xml b/kyuubi-assembly/pom.xml
index b75f532ed..d8c3f5192 100644
--- a/kyuubi-assembly/pom.xml
+++ b/kyuubi-assembly/pom.xml
@@ -53,7 +53,7 @@
 
         <dependency>
             <groupId>org.apache.kyuubi</groupId>
-            <artifactId>kyuubi-main</artifactId>
+            <artifactId>kyuubi-server</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/kyuubi-main/pom.xml b/kyuubi-server/pom.xml
similarity index 98%
rename from kyuubi-main/pom.xml
rename to kyuubi-server/pom.xml
index d29aefb99..2e1e4214c 100644
--- a/kyuubi-main/pom.xml
+++ b/kyuubi-server/pom.xml
@@ -26,8 +26,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>kyuubi-main</artifactId>
-    <name>Kyuubi Project Server Main</name>
+    <artifactId>kyuubi-server</artifactId>
+    <name>Kyuubi Project Server</name>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/client/KyuubiSyncThriftClient.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/client/KyuubiSyncThriftClient.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/client/KyuubiSyncThriftClient.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/client/KyuubiSyncThriftClient.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/engine/EngineRef.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/EngineRef.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/engine/EngineRef.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/engine/EngineRef.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/engine/ProcBuilder.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/ProcBuilder.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/engine/ProcBuilder.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/engine/ProcBuilder.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilder.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilder.scala
similarity index 99%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilder.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilder.scala
index c6b9fbf3f..8d0d7a9f3 100644
--- a/kyuubi-main/src/main/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilder.scala
+++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilder.scala
@@ -39,7 +39,8 @@ class SparkProcessBuilder(
 
   override protected val executable: String = {
     val sparkHomeOpt = env.get("SPARK_HOME").orElse {
-      val cwd = getClass.getProtectionDomain.getCodeSource.getLocation.getPath.split("kyuubi-main")
+      val cwd = getClass.getProtectionDomain.getCodeSource.getLocation.getPath
+        .split("kyuubi-server")
       assert(cwd.length > 1)
       Paths.get(cwd.head)
         .resolve("externals")
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/operation/ExecuteStatement.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/ExecuteStatement.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/operation/ExecuteStatement.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/operation/ExecuteStatement.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/operation/GetCatalogs.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/GetCatalogs.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/operation/GetCatalogs.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/operation/GetCatalogs.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/operation/GetColumns.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/GetColumns.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/operation/GetColumns.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/operation/GetColumns.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/operation/GetFunctions.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/GetFunctions.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/operation/GetFunctions.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/operation/GetFunctions.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/operation/GetSchemas.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/GetSchemas.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/operation/GetSchemas.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/operation/GetSchemas.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/operation/GetTableTypes.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/GetTableTypes.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/operation/GetTableTypes.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/operation/GetTableTypes.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/operation/GetTables.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/GetTables.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/operation/GetTables.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/operation/GetTables.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/operation/GetTypeInfo.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/GetTypeInfo.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/operation/GetTypeInfo.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/operation/GetTypeInfo.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/operation/KyuubiOperation.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/KyuubiOperation.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/operation/KyuubiOperation.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/operation/KyuubiOperation.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/operation/KyuubiOperationManager.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/KyuubiOperationManager.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/operation/KyuubiOperationManager.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/operation/KyuubiOperationManager.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/server/KyuubiBackendService.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiBackendService.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/server/KyuubiBackendService.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiBackendService.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/session/KyuubiSessionManager.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/session/KyuubiSessionManager.scala
similarity index 100%
rename from kyuubi-main/src/main/scala/org/apache/kyuubi/session/KyuubiSessionManager.scala
rename to kyuubi-server/src/main/scala/org/apache/kyuubi/session/KyuubiSessionManager.scala
diff --git a/kyuubi-main/src/test/resources/log4j.properties b/kyuubi-server/src/test/resources/log4j.properties
similarity index 100%
rename from kyuubi-main/src/test/resources/log4j.properties
rename to kyuubi-server/src/test/resources/log4j.properties
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q1/q1.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q1/q1.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q1/q1.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q1/q1.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q1/q1.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q1/q1.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q1/q1.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q1/q1.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q10/q10.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q10/q10.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q10/q10.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q10/q10.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q10/q10.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q10/q10.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q10/q10.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q10/q10.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q11/q11.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q11/q11.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q11/q11.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q11/q11.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q11/q11.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q11/q11.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q11/q11.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q11/q11.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q12/q12.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q12/q12.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q12/q12.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q12/q12.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q12/q12.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q12/q12.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q12/q12.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q12/q12.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q13/q13.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q13/q13.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q13/q13.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q13/q13.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q13/q13.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q13/q13.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q13/q13.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q13/q13.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q14/q14a.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q14/q14a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q14/q14a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q14/q14a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q14/q14a.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q14/q14a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q14/q14a.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q14/q14a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q14/q14b.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q14/q14b.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q14/q14b.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q14/q14b.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q14/q14b.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q14/q14b.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q14/q14b.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q14/q14b.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q15/q15.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q15/q15.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q15/q15.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q15/q15.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q15/q15.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q15/q15.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q15/q15.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q15/q15.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q16/q16.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q16/q16.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q16/q16.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q16/q16.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q16/q16.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q16/q16.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q16/q16.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q16/q16.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q17/q17.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q17/q17.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q17/q17.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q17/q17.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q17/q17.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q17/q17.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q17/q17.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q17/q17.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q18/q18.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q18/q18.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q18/q18.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q18/q18.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q18/q18.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q18/q18.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q18/q18.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q18/q18.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q19/q19.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q19/q19.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q19/q19.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q19/q19.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q19/q19.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q19/q19.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q19/q19.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q19/q19.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q2/q2.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q2/q2.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q2/q2.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q2/q2.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q2/q2.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q2/q2.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q2/q2.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q2/q2.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q20/q20.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q20/q20.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q20/q20.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q20/q20.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q20/q20.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q20/q20.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q20/q20.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q20/q20.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q21/q21.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q21/q21.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q21/q21.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q21/q21.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q21/q21.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q21/q21.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q21/q21.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q21/q21.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q22/q22.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q22/q22.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q22/q22.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q22/q22.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q22/q22.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q22/q22.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q22/q22.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q22/q22.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q23/q23a.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q23/q23a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q23/q23a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q23/q23a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q23/q23a.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q23/q23a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q23/q23a.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q23/q23a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q23/q23b.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q23/q23b.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q23/q23b.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q23/q23b.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q23/q23b.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q23/q23b.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q23/q23b.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q23/q23b.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q24/q24a.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q24/q24a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q24/q24a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q24/q24a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q24/q24a.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q24/q24a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q24/q24a.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q24/q24a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q24/q24b.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q24/q24b.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q24/q24b.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q24/q24b.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q24/q24b.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q24/q24b.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q24/q24b.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q24/q24b.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q25/q25.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q25/q25.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q25/q25.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q25/q25.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q25/q25.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q25/q25.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q25/q25.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q25/q25.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q26/q26.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q26/q26.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q26/q26.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q26/q26.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q26/q26.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q26/q26.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q26/q26.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q26/q26.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q27/q27.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q27/q27.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q27/q27.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q27/q27.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q27/q27.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q27/q27.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q27/q27.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q27/q27.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q28/q28.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q28/q28.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q28/q28.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q28/q28.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q28/q28.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q28/q28.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q28/q28.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q28/q28.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q29/q29.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q29/q29.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q29/q29.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q29/q29.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q29/q29.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q29/q29.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q29/q29.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q29/q29.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q3/q3.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q3/q3.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q3/q3.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q3/q3.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q3/q3.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q3/q3.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q3/q3.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q3/q3.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q30/q30.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q30/q30.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q30/q30.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q30/q30.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q30/q30.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q30/q30.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q30/q30.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q30/q30.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q31/q31.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q31/q31.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q31/q31.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q31/q31.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q31/q31.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q31/q31.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q31/q31.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q31/q31.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q32/q32.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q32/q32.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q32/q32.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q32/q32.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q32/q32.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q32/q32.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q32/q32.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q32/q32.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q33/q33.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q33/q33.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q33/q33.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q33/q33.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q33/q33.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q33/q33.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q33/q33.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q33/q33.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q34/q34.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q34/q34.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q34/q34.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q34/q34.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q34/q34.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q34/q34.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q34/q34.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q34/q34.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q35/q35.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q35/q35.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q35/q35.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q35/q35.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q35/q35.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q35/q35.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q35/q35.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q35/q35.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q36/q36.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q36/q36.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q36/q36.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q36/q36.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q36/q36.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q36/q36.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q36/q36.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q36/q36.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q37/q37.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q37/q37.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q37/q37.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q37/q37.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q37/q37.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q37/q37.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q37/q37.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q37/q37.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q38/q38.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q38/q38.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q38/q38.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q38/q38.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q38/q38.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q38/q38.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q38/q38.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q38/q38.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q39/q39a.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q39/q39a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q39/q39a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q39/q39a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q39/q39a.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q39/q39a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q39/q39a.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q39/q39a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q39/q39b.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q39/q39b.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q39/q39b.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q39/q39b.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q39/q39b.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q39/q39b.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q39/q39b.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q39/q39b.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q4/q4.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q4/q4.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q4/q4.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q4/q4.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q4/q4.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q4/q4.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q4/q4.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q4/q4.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q40/q40.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q40/q40.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q40/q40.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q40/q40.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q40/q40.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q40/q40.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q40/q40.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q40/q40.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q41/q41.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q41/q41.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q41/q41.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q41/q41.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q41/q41.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q41/q41.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q41/q41.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q41/q41.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q42/q42.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q42/q42.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q42/q42.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q42/q42.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q42/q42.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q42/q42.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q42/q42.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q42/q42.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q43/q43.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q43/q43.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q43/q43.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q43/q43.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q43/q43.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q43/q43.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q43/q43.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q43/q43.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q44/q44.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q44/q44.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q44/q44.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q44/q44.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q44/q44.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q44/q44.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q44/q44.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q44/q44.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q45/q45.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q45/q45.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q45/q45.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q45/q45.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q45/q45.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q45/q45.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q45/q45.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q45/q45.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q46/q46.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q46/q46.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q46/q46.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q46/q46.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q46/q46.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q46/q46.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q46/q46.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q46/q46.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q47/q47.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q47/q47.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q47/q47.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q47/q47.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q47/q47.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q47/q47.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q47/q47.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q47/q47.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q48/q48.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q48/q48.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q48/q48.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q48/q48.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q48/q48.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q48/q48.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q48/q48.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q48/q48.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q49/q49.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q49/q49.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q49/q49.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q49/q49.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q49/q49.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q49/q49.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q49/q49.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q49/q49.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q5/q5.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q5/q5.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q5/q5.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q5/q5.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q5/q5.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q5/q5.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q5/q5.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q5/q5.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q50/q50.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q50/q50.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q50/q50.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q50/q50.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q50/q50.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q50/q50.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q50/q50.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q50/q50.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q51/q51.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q51/q51.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q51/q51.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q51/q51.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q51/q51.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q51/q51.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q51/q51.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q51/q51.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q52/q52.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q52/q52.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q52/q52.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q52/q52.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q52/q52.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q52/q52.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q52/q52.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q52/q52.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q53/q53.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q53/q53.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q53/q53.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q53/q53.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q53/q53.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q53/q53.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q53/q53.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q53/q53.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q54/q54.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q54/q54.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q54/q54.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q54/q54.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q54/q54.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q54/q54.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q54/q54.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q54/q54.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q55/q55.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q55/q55.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q55/q55.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q55/q55.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q55/q55.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q55/q55.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q55/q55.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q55/q55.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q56/q56.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q56/q56.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q56/q56.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q56/q56.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q56/q56.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q56/q56.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q56/q56.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q56/q56.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q57/q57.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q57/q57.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q57/q57.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q57/q57.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q57/q57.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q57/q57.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q57/q57.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q57/q57.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q58/q58.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q58/q58.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q58/q58.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q58/q58.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q58/q58.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q58/q58.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q58/q58.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q58/q58.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q59/q59.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q59/q59.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q59/q59.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q59/q59.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q59/q59.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q59/q59.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q59/q59.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q59/q59.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q6/q6.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q6/q6.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q6/q6.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q6/q6.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q6/q6.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q6/q6.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q6/q6.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q6/q6.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q60/q60.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q60/q60.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q60/q60.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q60/q60.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q60/q60.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q60/q60.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q60/q60.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q60/q60.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q61/q61.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q61/q61.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q61/q61.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q61/q61.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q61/q61.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q61/q61.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q61/q61.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q61/q61.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q62/q62.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q62/q62.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q62/q62.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q62/q62.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q62/q62.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q62/q62.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q62/q62.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q62/q62.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q63/q63.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q63/q63.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q63/q63.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q63/q63.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q63/q63.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q63/q63.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q63/q63.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q63/q63.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q64/q64.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q64/q64.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q64/q64.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q64/q64.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q64/q64.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q64/q64.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q64/q64.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q64/q64.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q65/q65.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q65/q65.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q65/q65.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q65/q65.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q65/q65.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q65/q65.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q65/q65.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q65/q65.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q66/q66.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q66/q66.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q66/q66.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q66/q66.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q66/q66.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q66/q66.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q66/q66.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q66/q66.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q67/q67.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q67/q67.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q67/q67.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q67/q67.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q67/q67.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q67/q67.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q67/q67.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q67/q67.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q68/q68.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q68/q68.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q68/q68.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q68/q68.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q68/q68.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q68/q68.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q68/q68.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q68/q68.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q69/q69.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q69/q69.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q69/q69.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q69/q69.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q69/q69.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q69/q69.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q69/q69.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q69/q69.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q7/q7.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q7/q7.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q7/q7.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q7/q7.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q7/q7.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q7/q7.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q7/q7.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q7/q7.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q70/q70.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q70/q70.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q70/q70.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q70/q70.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q70/q70.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q70/q70.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q70/q70.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q70/q70.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q71/q71.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q71/q71.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q71/q71.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q71/q71.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q71/q71.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q71/q71.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q71/q71.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q71/q71.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q72/q72.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q72/q72.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q72/q72.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q72/q72.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q72/q72.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q72/q72.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q72/q72.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q72/q72.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q73/q73.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q73/q73.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q73/q73.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q73/q73.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q73/q73.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q73/q73.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q73/q73.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q73/q73.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q74/q74.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q74/q74.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q74/q74.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q74/q74.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q74/q74.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q74/q74.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q74/q74.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q74/q74.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q75/q75.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q75/q75.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q75/q75.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q75/q75.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q75/q75.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q75/q75.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q75/q75.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q75/q75.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q76/q76.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q76/q76.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q76/q76.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q76/q76.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q76/q76.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q76/q76.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q76/q76.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q76/q76.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q77/q77.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q77/q77.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q77/q77.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q77/q77.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q77/q77.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q77/q77.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q77/q77.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q77/q77.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q78/q78.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q78/q78.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q78/q78.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q78/q78.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q78/q78.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q78/q78.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q78/q78.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q78/q78.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q79/q79.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q79/q79.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q79/q79.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q79/q79.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q79/q79.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q79/q79.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q79/q79.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q79/q79.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q8/q8.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q8/q8.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q8/q8.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q8/q8.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q8/q8.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q8/q8.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q8/q8.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q8/q8.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q80/q80.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q80/q80.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q80/q80.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q80/q80.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q80/q80.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q80/q80.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q80/q80.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q80/q80.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q81/q81.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q81/q81.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q81/q81.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q81/q81.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q81/q81.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q81/q81.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q81/q81.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q81/q81.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q82/q82.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q82/q82.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q82/q82.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q82/q82.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q82/q82.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q82/q82.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q82/q82.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q82/q82.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q83/q83.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q83/q83.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q83/q83.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q83/q83.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q83/q83.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q83/q83.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q83/q83.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q83/q83.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q84/q84.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q84/q84.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q84/q84.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q84/q84.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q84/q84.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q84/q84.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q84/q84.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q84/q84.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q85/q85.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q85/q85.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q85/q85.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q85/q85.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q85/q85.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q85/q85.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q85/q85.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q85/q85.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q86/q86.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q86/q86.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q86/q86.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q86/q86.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q86/q86.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q86/q86.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q86/q86.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q86/q86.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q87/q87.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q87/q87.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q87/q87.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q87/q87.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q87/q87.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q87/q87.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q87/q87.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q87/q87.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q88/q88.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q88/q88.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q88/q88.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q88/q88.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q88/q88.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q88/q88.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q88/q88.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q88/q88.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q89/q89.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q89/q89.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q89/q89.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q89/q89.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q89/q89.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q89/q89.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q89/q89.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q89/q89.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q9/q9.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q9/q9.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q9/q9.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q9/q9.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q9/q9.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q9/q9.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q9/q9.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q9/q9.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q90/q90.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q90/q90.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q90/q90.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q90/q90.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q90/q90.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q90/q90.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q90/q90.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q90/q90.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q91/q91.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q91/q91.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q91/q91.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q91/q91.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q91/q91.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q91/q91.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q91/q91.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q91/q91.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q92/q92.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q92/q92.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q92/q92.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q92/q92.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q92/q92.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q92/q92.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q92/q92.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q92/q92.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q93/q93.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q93/q93.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q93/q93.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q93/q93.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q93/q93.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q93/q93.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q93/q93.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q93/q93.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q94/q94.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q94/q94.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q94/q94.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q94/q94.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q94/q94.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q94/q94.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q94/q94.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q94/q94.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q95/q95.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q95/q95.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q95/q95.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q95/q95.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q95/q95.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q95/q95.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q95/q95.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q95/q95.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q96/q96.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q96/q96.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q96/q96.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q96/q96.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q96/q96.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q96/q96.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q96/q96.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q96/q96.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q97/q97.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q97/q97.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q97/q97.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q97/q97.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q97/q97.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q97/q97.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q97/q97.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q97/q97.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q98/q98.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q98/q98.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q98/q98.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q98/q98.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q98/q98.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q98/q98.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q98/q98.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q98/q98.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q99/q99.output.schema b/kyuubi-server/src/test/resources/tpcds-1_4/q99/q99.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q99/q99.output.schema
rename to kyuubi-server/src/test/resources/tpcds-1_4/q99/q99.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-1_4/q99/q99.sql b/kyuubi-server/src/test/resources/tpcds-1_4/q99/q99.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-1_4/q99/q99.sql
rename to kyuubi-server/src/test/resources/tpcds-1_4/q99/q99.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q10/q10a.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q10/q10a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q10/q10a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q10/q10a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q10/q10a.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q10/q10a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q10/q10a.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q10/q10a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q11/q11.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q11/q11.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q11/q11.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q11/q11.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q11/q11.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q11/q11.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q11/q11.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q11/q11.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q12/q12.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q12/q12.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q12/q12.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q12/q12.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q12/q12.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q12/q12.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q12/q12.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q12/q12.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q14/q14.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q14/q14.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q14/q14.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q14/q14.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q14/q14.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q14/q14.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q14/q14.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q14/q14.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q14/q14a.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q14/q14a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q14/q14a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q14/q14a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q14/q14a.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q14/q14a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q14/q14a.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q14/q14a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q18/q18a.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q18/q18a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q18/q18a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q18/q18a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q18/q18a.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q18/q18a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q18/q18a.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q18/q18a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q20/q20.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q20/q20.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q20/q20.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q20/q20.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q20/q20.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q20/q20.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q20/q20.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q20/q20.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q22/q22.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q22/q22.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q22/q22.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q22/q22.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q22/q22.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q22/q22.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q22/q22.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q22/q22.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q22/q22a.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q22/q22a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q22/q22a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q22/q22a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q22/q22a.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q22/q22a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q22/q22a.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q22/q22a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q24/q24.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q24/q24.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q24/q24.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q24/q24.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q24/q24.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q24/q24.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q24/q24.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q24/q24.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q27/q27a.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q27/q27a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q27/q27a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q27/q27a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q27/q27a.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q27/q27a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q27/q27a.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q27/q27a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q34/q34.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q34/q34.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q34/q34.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q34/q34.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q34/q34.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q34/q34.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q34/q34.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q34/q34.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q35/q35.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q35/q35.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q35/q35.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q35/q35.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q35/q35.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q35/q35.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q35/q35.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q35/q35.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q35/q35a.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q35/q35a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q35/q35a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q35/q35a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q35/q35a.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q35/q35a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q35/q35a.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q35/q35a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q36/q36a.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q36/q36a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q36/q36a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q36/q36a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q36/q36a.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q36/q36a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q36/q36a.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q36/q36a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q47/q47.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q47/q47.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q47/q47.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q47/q47.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q47/q47.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q47/q47.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q47/q47.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q47/q47.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q49/q49.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q49/q49.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q49/q49.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q49/q49.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q49/q49.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q49/q49.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q49/q49.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q49/q49.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q5/q5a.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q5/q5a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q5/q5a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q5/q5a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q5/q5a.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q5/q5a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q5/q5a.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q5/q5a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q51/q51a.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q51/q51a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q51/q51a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q51/q51a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q51/q51a.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q51/q51a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q51/q51a.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q51/q51a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q57/q57.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q57/q57.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q57/q57.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q57/q57.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q57/q57.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q57/q57.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q57/q57.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q57/q57.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q6/q6.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q6/q6.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q6/q6.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q6/q6.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q6/q6.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q6/q6.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q6/q6.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q6/q6.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q64/q64.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q64/q64.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q64/q64.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q64/q64.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q64/q64.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q64/q64.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q64/q64.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q64/q64.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q67/q67a.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q67/q67a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q67/q67a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q67/q67a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q67/q67a.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q67/q67a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q67/q67a.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q67/q67a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q70/q70a.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q70/q70a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q70/q70a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q70/q70a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q70/q70a.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q70/q70a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q70/q70a.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q70/q70a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q72/q72.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q72/q72.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q72/q72.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q72/q72.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q72/q72.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q72/q72.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q72/q72.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q72/q72.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q74/q74.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q74/q74.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q74/q74.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q74/q74.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q74/q74.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q74/q74.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q74/q74.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q74/q74.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q75/q75.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q75/q75.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q75/q75.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q75/q75.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q75/q75.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q75/q75.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q75/q75.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q75/q75.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q77/q77a.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q77/q77a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q77/q77a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q77/q77a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q77/q77a.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q77/q77a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q77/q77a.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q77/q77a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q78/q78.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q78/q78.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q78/q78.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q78/q78.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q78/q78.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q78/q78.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q78/q78.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q78/q78.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q80/q80a.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q80/q80a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q80/q80a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q80/q80a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q80/q80a.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q80/q80a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q80/q80a.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q80/q80a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q86/q86a.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q86/q86a.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q86/q86a.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q86/q86a.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q86/q86a.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q86/q86a.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q86/q86a.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q86/q86a.sql
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q98/q98.output.schema b/kyuubi-server/src/test/resources/tpcds-2_7/q98/q98.output.schema
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q98/q98.output.schema
rename to kyuubi-server/src/test/resources/tpcds-2_7/q98/q98.output.schema
diff --git a/kyuubi-main/src/test/resources/tpcds-2_7/q98/q98.sql b/kyuubi-server/src/test/resources/tpcds-2_7/q98/q98.sql
similarity index 100%
rename from kyuubi-main/src/test/resources/tpcds-2_7/q98/q98.sql
rename to kyuubi-server/src/test/resources/tpcds-2_7/q98/q98.sql
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/WithKyuubiServer.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/WithKyuubiServer.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/WithKyuubiServer.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/WithKyuubiServer.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/WithKyuubiServerOnYarn.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/WithKyuubiServerOnYarn.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/WithKyuubiServerOnYarn.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/WithKyuubiServerOnYarn.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/config/AllKyuubiConfiguration.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/config/AllKyuubiConfiguration.scala
similarity index 99%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/config/AllKyuubiConfiguration.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/config/AllKyuubiConfiguration.scala
index 7e23c2879..b3072de40 100644
--- a/kyuubi-main/src/test/scala/org/apache/kyuubi/config/AllKyuubiConfiguration.scala
+++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/config/AllKyuubiConfiguration.scala
@@ -46,7 +46,7 @@ import org.apache.kyuubi.zookeeper.ZookeeperConf
 // scalastyle:on line.size.limit
 class AllKyuubiConfiguration extends KyuubiFunSuite {
   private val kyuubiHome: String =
-    getClass.getProtectionDomain.getCodeSource.getLocation.getPath.split("kyuubi-main")(0)
+    getClass.getProtectionDomain.getCodeSource.getLocation.getPath.split("kyuubi-server")(0)
   private val markdown = Paths.get(kyuubiHome, "docs", "deployment", "settings.md")
     .toAbsolutePath
 
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/engine/EngineRefSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/EngineRefSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/engine/EngineRefSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/engine/EngineRefSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/engine/spark/InitializeSQLSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/spark/InitializeSQLSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/engine/spark/InitializeSQLSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/engine/spark/InitializeSQLSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilderSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilderSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilderSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilderSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/engine/spark/SparkSqlEngineSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/spark/SparkSqlEngineSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/engine/spark/SparkSqlEngineSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/engine/spark/SparkSqlEngineSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationHiveCatalogSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationHiveCatalogSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationHiveCatalogSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationHiveCatalogSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationManagerSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationManagerSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationManagerSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationManagerSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerConnectionSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerConnectionSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerConnectionSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerConnectionSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerServerSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerServerSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerServerSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerServerSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerUserSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerUserSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerUserSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerUserSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationYarnClusterSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationYarnClusterSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationYarnClusterSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationYarnClusterSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/datalake/DeltaOperationSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/datalake/DeltaOperationSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/operation/datalake/DeltaOperationSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/operation/datalake/DeltaOperationSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/datalake/IcebergOperationSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/datalake/IcebergOperationSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/operation/datalake/IcebergOperationSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/operation/datalake/IcebergOperationSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/tpcds/DDLTPCDSSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/tpcds/DDLTPCDSSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/operation/tpcds/DDLTPCDSSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/operation/tpcds/DDLTPCDSSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/tpcds/OutputSchemaTPCDSSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/tpcds/OutputSchemaTPCDSSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/operation/tpcds/OutputSchemaTPCDSSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/operation/tpcds/OutputSchemaTPCDSSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/tpcds/TPCDSHelper.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/tpcds/TPCDSHelper.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/operation/tpcds/TPCDSHelper.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/operation/tpcds/TPCDSHelper.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/server/KyuubiServerSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/KyuubiServerSuite.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/server/KyuubiServerSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/server/KyuubiServerSuite.scala
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/server/MiniYarnService.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/MiniYarnService.scala
similarity index 100%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/server/MiniYarnService.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/server/MiniYarnService.scala
diff --git a/pom.xml b/pom.xml
index 29570c8ef..ab2755ebd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,8 +84,8 @@
         <module>kyuubi-ctl</module>
         <module>kyuubi-ha</module>
         <module>kyuubi-hive-jdbc</module>
-        <module>kyuubi-main</module>
         <module>kyuubi-metrics</module>
+        <module>kyuubi-server</module>
         <module>kyuubi-zookeeper</module>
     </modules>