diff --git a/src/main/java/com/alibaba/druid/hbase/HDriver.java b/src/main/java/com/alibaba/druid/hbase/HDriver.java
index fb40df47cc..b161e2f88a 100644
--- a/src/main/java/com/alibaba/druid/hbase/HDriver.java
+++ b/src/main/java/com/alibaba/druid/hbase/HDriver.java
@@ -5,6 +5,8 @@ import java.sql.DriverPropertyInfo;
 import java.sql.SQLException;
 import java.util.Properties;
 
+import com.alibaba.druid.hbase.jdbc.HBaseConnection;
+
 public class HDriver implements Driver {
 
     public static String PREFIX = "jdbc:druid-hbase:";
diff --git a/src/main/java/com/alibaba/druid/hbase/exec/ExecutePlan.java b/src/main/java/com/alibaba/druid/hbase/exec/ExecutePlan.java
index be7e9b34be..2d0735af83 100644
--- a/src/main/java/com/alibaba/druid/hbase/exec/ExecutePlan.java
+++ b/src/main/java/com/alibaba/druid/hbase/exec/ExecutePlan.java
@@ -2,8 +2,8 @@ package com.alibaba.druid.hbase.exec;
 
 import java.sql.SQLException;
 
-import com.alibaba.druid.hbase.HPreparedStatement;
-import com.alibaba.druid.hbase.HResultSet;
+import com.alibaba.druid.hbase.jdbc.HPreparedStatement;
+import com.alibaba.druid.hbase.jdbc.HResultSet;
 
 public interface ExecutePlan {
 
diff --git a/src/main/java/com/alibaba/druid/hbase/exec/ExecutePlanAdapter.java b/src/main/java/com/alibaba/druid/hbase/exec/ExecutePlanAdapter.java
index 398992ac02..9fc693945d 100644
--- a/src/main/java/com/alibaba/druid/hbase/exec/ExecutePlanAdapter.java
+++ b/src/main/java/com/alibaba/druid/hbase/exec/ExecutePlanAdapter.java
@@ -2,8 +2,8 @@ package com.alibaba.druid.hbase.exec;
 
 import java.sql.SQLException;
 
-import com.alibaba.druid.hbase.HPreparedStatement;
-import com.alibaba.druid.hbase.HResultSet;
+import com.alibaba.druid.hbase.jdbc.HPreparedStatement;
+import com.alibaba.druid.hbase.jdbc.HResultSet;
 
 public class ExecutePlanAdapter implements ExecutePlan {
 
diff --git a/src/main/java/com/alibaba/druid/hbase/exec/InsertExecutePlan.java b/src/main/java/com/alibaba/druid/hbase/exec/InsertExecutePlan.java
index 36e7bd3640..3be385b4d8 100644
--- a/src/main/java/com/alibaba/druid/hbase/exec/InsertExecutePlan.java
+++ b/src/main/java/com/alibaba/druid/hbase/exec/InsertExecutePlan.java
@@ -8,8 +8,8 @@ import org.apache.hadoop.hbase.client.HTableInterface;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.alibaba.druid.hbase.HBaseConnection;
-import com.alibaba.druid.hbase.HPreparedStatement;
+import com.alibaba.druid.hbase.jdbc.HBaseConnection;
+import com.alibaba.druid.hbase.jdbc.HPreparedStatement;
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils;
 
diff --git a/src/main/java/com/alibaba/druid/hbase/exec/ShowTablesPlan.java b/src/main/java/com/alibaba/druid/hbase/exec/ShowTablesPlan.java
index 5f12692a4a..ed54a32e8f 100644
--- a/src/main/java/com/alibaba/druid/hbase/exec/ShowTablesPlan.java
+++ b/src/main/java/com/alibaba/druid/hbase/exec/ShowTablesPlan.java
@@ -10,9 +10,9 @@ import org.apache.hadoop.hbase.client.HBaseAdmin;
 
 import com.alibaba.druid.common.jdbc.ResultSetBase;
 import com.alibaba.druid.common.jdbc.ResultSetMetaDataBase.ColumnMetaData;
-import com.alibaba.druid.hbase.HPreparedStatement;
-import com.alibaba.druid.hbase.HResultSet;
-import com.alibaba.druid.hbase.HResultSetMetaData;
+import com.alibaba.druid.hbase.jdbc.HPreparedStatement;
+import com.alibaba.druid.hbase.jdbc.HResultSet;
+import com.alibaba.druid.hbase.jdbc.HResultSetMetaData;
 
 public class ShowTablesPlan implements ExecutePlan {
 
diff --git a/src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java b/src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java
index 1cff540c00..7509d19a17 100644
--- a/src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java
+++ b/src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java
@@ -15,10 +15,10 @@ import org.apache.hadoop.hbase.filter.RowFilter;
 import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.alibaba.druid.hbase.HBaseConnection;
-import com.alibaba.druid.hbase.HPreparedStatement;
-import com.alibaba.druid.hbase.HBaseResultSet;
-import com.alibaba.druid.hbase.HResultSetMetaData;
+import com.alibaba.druid.hbase.jdbc.HBaseConnection;
+import com.alibaba.druid.hbase.jdbc.HBaseResultSet;
+import com.alibaba.druid.hbase.jdbc.HPreparedStatement;
+import com.alibaba.druid.hbase.jdbc.HResultSetMetaData;
 import com.alibaba.druid.hbase.mapping.HMapping;
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
diff --git a/src/main/java/com/alibaba/druid/hbase/HBaseConnection.java b/src/main/java/com/alibaba/druid/hbase/jdbc/HBaseConnection.java
similarity index 98%
rename from src/main/java/com/alibaba/druid/hbase/HBaseConnection.java
rename to src/main/java/com/alibaba/druid/hbase/jdbc/HBaseConnection.java
index df7bd4f4b8..7b777aab22 100644
--- a/src/main/java/com/alibaba/druid/hbase/HBaseConnection.java
+++ b/src/main/java/com/alibaba/druid/hbase/jdbc/HBaseConnection.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.hbase;
+package com.alibaba.druid.hbase.jdbc;
 
 import java.sql.Array;
 import java.sql.Blob;
@@ -22,6 +22,7 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.client.HTableInterface;
 
 import com.alibaba.druid.common.jdbc.ConnectionBase;
+import com.alibaba.druid.hbase.HEngine;
 
 public class HBaseConnection extends ConnectionBase implements Connection {
 
diff --git a/src/main/java/com/alibaba/druid/hbase/HBaseResultSet.java b/src/main/java/com/alibaba/druid/hbase/jdbc/HBaseResultSet.java
similarity index 99%
rename from src/main/java/com/alibaba/druid/hbase/HBaseResultSet.java
rename to src/main/java/com/alibaba/druid/hbase/jdbc/HBaseResultSet.java
index b88542bb3b..41705b1802 100644
--- a/src/main/java/com/alibaba/druid/hbase/HBaseResultSet.java
+++ b/src/main/java/com/alibaba/druid/hbase/jdbc/HBaseResultSet.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.hbase;
+package com.alibaba.druid.hbase.jdbc;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/main/java/com/alibaba/druid/hbase/HPreparedStatement.java b/src/main/java/com/alibaba/druid/hbase/jdbc/HPreparedStatement.java
similarity index 99%
rename from src/main/java/com/alibaba/druid/hbase/HPreparedStatement.java
rename to src/main/java/com/alibaba/druid/hbase/jdbc/HPreparedStatement.java
index cc52200f62..2333ae6688 100644
--- a/src/main/java/com/alibaba/druid/hbase/HPreparedStatement.java
+++ b/src/main/java/com/alibaba/druid/hbase/jdbc/HPreparedStatement.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.hbase;
+package com.alibaba.druid.hbase.jdbc;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
diff --git a/src/main/java/com/alibaba/druid/hbase/HResultSet.java b/src/main/java/com/alibaba/druid/hbase/jdbc/HResultSet.java
similarity index 68%
rename from src/main/java/com/alibaba/druid/hbase/HResultSet.java
rename to src/main/java/com/alibaba/druid/hbase/jdbc/HResultSet.java
index b9671ebbd8..ed83a286e9 100644
--- a/src/main/java/com/alibaba/druid/hbase/HResultSet.java
+++ b/src/main/java/com/alibaba/druid/hbase/jdbc/HResultSet.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.hbase;
+package com.alibaba.druid.hbase.jdbc;
 
 import java.sql.ResultSet;
 
diff --git a/src/main/java/com/alibaba/druid/hbase/HResultSetMetaData.java b/src/main/java/com/alibaba/druid/hbase/jdbc/HResultSetMetaData.java
similarity index 77%
rename from src/main/java/com/alibaba/druid/hbase/HResultSetMetaData.java
rename to src/main/java/com/alibaba/druid/hbase/jdbc/HResultSetMetaData.java
index 5cf6f92c48..a0b57034a8 100644
--- a/src/main/java/com/alibaba/druid/hbase/HResultSetMetaData.java
+++ b/src/main/java/com/alibaba/druid/hbase/jdbc/HResultSetMetaData.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.hbase;
+package com.alibaba.druid.hbase.jdbc;
 
 import com.alibaba.druid.common.jdbc.ResultSetMetaDataBase;
 
diff --git a/src/main/java/com/alibaba/druid/hbase/HStatement.java b/src/main/java/com/alibaba/druid/hbase/jdbc/HStatement.java
similarity index 92%
rename from src/main/java/com/alibaba/druid/hbase/HStatement.java
rename to src/main/java/com/alibaba/druid/hbase/jdbc/HStatement.java
index dd6e195a7a..e75139b100 100644
--- a/src/main/java/com/alibaba/druid/hbase/HStatement.java
+++ b/src/main/java/com/alibaba/druid/hbase/jdbc/HStatement.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.hbase;
+package com.alibaba.druid.hbase.jdbc;
 
 import java.sql.SQLException;
 import java.sql.Statement;
diff --git a/src/main/java/com/alibaba/druid/hbase/HStatementInterface.java b/src/main/java/com/alibaba/druid/hbase/jdbc/HStatementInterface.java
similarity index 82%
rename from src/main/java/com/alibaba/druid/hbase/HStatementInterface.java
rename to src/main/java/com/alibaba/druid/hbase/jdbc/HStatementInterface.java
index a450e678a3..0e783bdab8 100644
--- a/src/main/java/com/alibaba/druid/hbase/HStatementInterface.java
+++ b/src/main/java/com/alibaba/druid/hbase/jdbc/HStatementInterface.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.hbase;
+package com.alibaba.druid.hbase.jdbc;
 
 import java.sql.SQLException;
 import java.sql.Statement;
diff --git a/src/test/java/com/alibaba/druid/hbase/HBQLShowTableTest.java b/src/test/java/com/alibaba/druid/hbase/HBQLShowTableTest.java
index 35098e7f2c..fa80915c03 100644
--- a/src/test/java/com/alibaba/druid/hbase/HBQLShowTableTest.java
+++ b/src/test/java/com/alibaba/druid/hbase/HBQLShowTableTest.java
@@ -5,6 +5,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Properties;
 
+import com.alibaba.druid.util.JdbcUtils;
+
 import junit.framework.TestCase;
 
 
@@ -17,21 +19,22 @@ public class HBQLShowTableTest extends TestCase {
         stmt.setInt(1, 6);
         
         ResultSet rs = stmt.executeQuery();
-        while (rs.next()) {
-            System.out.print(rs.getString("name"));
-            System.out.print(' ');
-            System.out.print(rs.getString("owner"));
-            System.out.print(' ');
-            System.out.print(rs.getString("familys"));
-            System.out.print(' ');
-            System.out.print(rs.getLong("maxFileSize"));
-            System.out.print(' ');
-            System.out.print(rs.getLong("memStoreFlushSize"));
-            System.out.print(' ');
-            System.out.print(rs.getString("regionSplitPolicyClassName"));
-            System.out.print(' ');
-            System.out.println();
-        }
+        JdbcUtils.printResultSet(rs);
+//        while (rs.next()) {
+//            System.out.print(rs.getString("name"));
+//            System.out.print(' ');
+//            System.out.print(rs.getString("owner"));
+//            System.out.print(' ');
+//            System.out.print(rs.getString("familys"));
+//            System.out.print(' ');
+//            System.out.print(rs.getLong("maxFileSize"));
+//            System.out.print(' ');
+//            System.out.print(rs.getLong("memStoreFlushSize"));
+//            System.out.print(' ');
+//            System.out.print(rs.getString("regionSplitPolicyClassName"));
+//            System.out.print(' ');
+//            System.out.println();
+//        }
         rs.close();
         stmt.close();