diff --git a/kyuubi-server/pom.xml b/kyuubi-server/pom.xml
index 464adc5456f..d6d0e1df6fe 100644
--- a/kyuubi-server/pom.xml
+++ b/kyuubi-server/pom.xml
@@ -39,6 +39,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>yaooqinn</groupId>
+            <artifactId>kyuubi-thrift</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>${spark.group}</groupId>
             <artifactId>spark-yarn_${scala.binary.version}</artifactId>
@@ -234,25 +240,6 @@
                 <artifactId>scala-maven-plugin</artifactId>
             </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/gen/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -261,6 +248,7 @@
                     <artifactSet>
                         <includes>
                             <include>yaooqinn:kyuubi-common</include>
+                            <include>yaooqinn:kyuubi-thrift</include>
                         </includes>
                     </artifactSet>
                 </configuration>
@@ -312,7 +300,6 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <configuration>
                     <excludes>
-                        <exclude>**/org/apache/hive/service/cli/thrift/*.class</exclude>
                         <exclude>**/org/apache/spark/launcher/*.class</exclude>
                         <exclude>**/org/apache/spark/deploy/*.class</exclude>
                         <exclude>**/org/apache/spark/SparkEnv.class</exclude>
diff --git a/kyuubi-server/if/TCLIService.thrift b/kyuubi-thrift/if/TCLIService.thrift
similarity index 100%
rename from kyuubi-server/if/TCLIService.thrift
rename to kyuubi-thrift/if/TCLIService.thrift
diff --git a/kyuubi-thrift/pom.xml b/kyuubi-thrift/pom.xml
new file mode 100644
index 00000000000..f3f74a0f431
--- /dev/null
+++ b/kyuubi-thrift/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>kyuubi</artifactId>
+        <groupId>yaooqinn</groupId>
+        <version>0.8.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>kyuubi-thrift</artifactId>
+    <packaging>jar</packaging>
+    <name>Kyuubi Project Thrift IDL</name>
+    <dependencies>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.thrift</groupId>
+            <artifactId>libthrift</artifactId>
+            <version>0.9.3</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/gen/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TArrayTypeEntry.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TArrayTypeEntry.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TArrayTypeEntry.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TArrayTypeEntry.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TBinaryColumn.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TBinaryColumn.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TBinaryColumn.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TBinaryColumn.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TBoolColumn.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TBoolColumn.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TBoolColumn.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TBoolColumn.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TBoolValue.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TBoolValue.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TBoolValue.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TBoolValue.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TByteColumn.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TByteColumn.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TByteColumn.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TByteColumn.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TByteValue.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TByteValue.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TByteValue.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TByteValue.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCLIService.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCLIService.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCLIService.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCLIService.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCLIServiceConstants.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCLIServiceConstants.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCLIServiceConstants.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCLIServiceConstants.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCancelDelegationTokenReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCancelDelegationTokenReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCancelDelegationTokenReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCancelDelegationTokenReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCancelDelegationTokenResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCancelDelegationTokenResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCancelDelegationTokenResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCancelDelegationTokenResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCancelOperationReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCancelOperationReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCancelOperationReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCancelOperationReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCancelOperationResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCancelOperationResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCancelOperationResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCancelOperationResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCloseOperationReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCloseOperationReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCloseOperationReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCloseOperationReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCloseOperationResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCloseOperationResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCloseOperationResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCloseOperationResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCloseSessionReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCloseSessionReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCloseSessionReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCloseSessionReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCloseSessionResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCloseSessionResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TCloseSessionResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TCloseSessionResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TColumn.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TColumn.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TColumn.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TColumn.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TColumnDesc.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TColumnDesc.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TColumnDesc.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TColumnDesc.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TColumnValue.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TColumnValue.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TColumnValue.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TColumnValue.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TDoubleColumn.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TDoubleColumn.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TDoubleColumn.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TDoubleColumn.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TDoubleValue.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TDoubleValue.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TDoubleValue.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TDoubleValue.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TExecuteStatementReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TExecuteStatementReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TExecuteStatementReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TExecuteStatementReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TExecuteStatementResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TExecuteStatementResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TExecuteStatementResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TExecuteStatementResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TFetchOrientation.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TFetchOrientation.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TFetchOrientation.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TFetchOrientation.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TFetchResultsReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TFetchResultsReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TFetchResultsReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TFetchResultsReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TFetchResultsResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TFetchResultsResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TFetchResultsResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TFetchResultsResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetCatalogsReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetCatalogsReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetCatalogsReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetCatalogsReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetCatalogsResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetCatalogsResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetCatalogsResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetCatalogsResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetColumnsReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetColumnsReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetColumnsReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetColumnsReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetColumnsResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetColumnsResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetColumnsResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetColumnsResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetDelegationTokenReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetDelegationTokenReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetDelegationTokenReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetDelegationTokenReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetDelegationTokenResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetDelegationTokenResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetDelegationTokenResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetDelegationTokenResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetFunctionsReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetFunctionsReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetFunctionsReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetFunctionsReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetFunctionsResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetFunctionsResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetFunctionsResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetFunctionsResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoType.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoType.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoType.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoType.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoValue.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoValue.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoValue.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetInfoValue.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetOperationStatusReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetOperationStatusReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetOperationStatusReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetOperationStatusReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetOperationStatusResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetOperationStatusResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetOperationStatusResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetOperationStatusResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetResultSetMetadataReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetResultSetMetadataReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetResultSetMetadataReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetResultSetMetadataReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetResultSetMetadataResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetResultSetMetadataResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetResultSetMetadataResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetResultSetMetadataResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetSchemasReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetSchemasReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetSchemasReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetSchemasReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetSchemasResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetSchemasResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetSchemasResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetSchemasResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetTableTypesReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetTableTypesReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetTableTypesReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetTableTypesReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetTableTypesResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetTableTypesResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetTableTypesResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetTableTypesResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetTablesReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetTablesReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetTablesReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetTablesReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetTablesResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetTablesResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetTablesResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetTablesResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetTypeInfoReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetTypeInfoReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetTypeInfoReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetTypeInfoReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetTypeInfoResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetTypeInfoResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TGetTypeInfoResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TGetTypeInfoResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/THandleIdentifier.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/THandleIdentifier.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/THandleIdentifier.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/THandleIdentifier.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TI16Column.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TI16Column.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TI16Column.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TI16Column.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TI16Value.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TI16Value.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TI16Value.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TI16Value.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TI32Column.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TI32Column.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TI32Column.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TI32Column.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TI32Value.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TI32Value.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TI32Value.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TI32Value.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TI64Column.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TI64Column.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TI64Column.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TI64Column.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TI64Value.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TI64Value.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TI64Value.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TI64Value.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TMapTypeEntry.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TMapTypeEntry.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TMapTypeEntry.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TMapTypeEntry.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TOpenSessionReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TOpenSessionReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TOpenSessionReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TOpenSessionReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TOpenSessionResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TOpenSessionResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TOpenSessionResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TOpenSessionResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TOperationHandle.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TOperationHandle.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TOperationHandle.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TOperationHandle.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TOperationState.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TOperationState.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TOperationState.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TOperationState.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TOperationType.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TOperationType.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TOperationType.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TOperationType.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TPrimitiveTypeEntry.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TPrimitiveTypeEntry.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TPrimitiveTypeEntry.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TPrimitiveTypeEntry.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TProtocolVersion.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TProtocolVersion.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TProtocolVersion.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TProtocolVersion.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TRenewDelegationTokenReq.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TRenewDelegationTokenReq.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TRenewDelegationTokenReq.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TRenewDelegationTokenReq.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TRenewDelegationTokenResp.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TRenewDelegationTokenResp.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TRenewDelegationTokenResp.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TRenewDelegationTokenResp.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TRow.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TRow.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TRow.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TRow.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TRowSet.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TRowSet.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TRowSet.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TRowSet.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TSessionHandle.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TSessionHandle.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TSessionHandle.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TSessionHandle.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TStatus.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TStatus.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TStatus.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TStatus.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TStatusCode.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TStatusCode.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TStatusCode.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TStatusCode.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TStringColumn.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TStringColumn.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TStringColumn.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TStringColumn.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TStringValue.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TStringValue.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TStringValue.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TStringValue.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TStructTypeEntry.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TStructTypeEntry.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TStructTypeEntry.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TStructTypeEntry.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TTableSchema.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TTableSchema.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TTableSchema.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TTableSchema.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TTypeDesc.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TTypeDesc.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TTypeDesc.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TTypeDesc.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TTypeEntry.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TTypeEntry.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TTypeEntry.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TTypeEntry.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TTypeId.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TTypeId.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TTypeId.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TTypeId.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TTypeQualifierValue.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TTypeQualifierValue.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TTypeQualifierValue.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TTypeQualifierValue.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TTypeQualifiers.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TTypeQualifiers.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TTypeQualifiers.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TTypeQualifiers.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TUnionTypeEntry.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TUnionTypeEntry.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TUnionTypeEntry.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TUnionTypeEntry.java
diff --git a/kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TUserDefinedTypeEntry.java b/kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TUserDefinedTypeEntry.java
similarity index 100%
rename from kyuubi-server/src/gen/java/org/apache/hive/service/cli/thrift/TUserDefinedTypeEntry.java
rename to kyuubi-thrift/src/gen/java/org/apache/hive/service/cli/thrift/TUserDefinedTypeEntry.java
diff --git a/pom.xml b/pom.xml
index e099789b8a5..8edb654b3c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
     <version>0.8.0-SNAPSHOT</version>
     <modules>
         <module>kyuubi-common</module>
+        <module>kyuubi-thrift</module>
         <module>kyuubi-server</module>
     </modules>
     <packaging>pom</packaging>
@@ -67,6 +68,7 @@
         <apacheds.version>2.0.0-M15</apacheds.version>
         <curator.version>2.6.0</curator.version>
         <codahale.metrics.version>3.1.2</codahale.metrics.version>
+        <commons-lang.version>2.6</commons-lang.version>
     </properties>
 
     <repositories>
@@ -276,6 +278,12 @@
                 <version>${codahale.metrics.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>${commons-lang.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.scalatest</groupId>
                 <artifactId>scalatest_${scala.binary.version}</artifactId>