diff --git a/src/main/java/com/alibaba/druid/hdriver/HConnection.java b/src/main/java/com/alibaba/druid/hdriver/HConnection.java
index bf35951fd7..605fbf014d 100644
--- a/src/main/java/com/alibaba/druid/hdriver/HConnection.java
+++ b/src/main/java/com/alibaba/druid/hdriver/HConnection.java
@@ -3,7 +3,7 @@ package com.alibaba.druid.hdriver;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import com.alibaba.druid.hdriver.impl.jdbc.HPreparedStatementImpl;
+import com.alibaba.druid.hdriver.impl.HPreparedStatementImpl;
 
 public interface HConnection extends Connection {
     HPreparedStatementImpl prepareStatement(String sql) throws SQLException;
diff --git a/src/main/java/com/alibaba/druid/hdriver/HDriver.java b/src/main/java/com/alibaba/druid/hdriver/HDriver.java
index 0ae56a81ad..1a75f2d147 100644
--- a/src/main/java/com/alibaba/druid/hdriver/HDriver.java
+++ b/src/main/java/com/alibaba/druid/hdriver/HDriver.java
@@ -5,8 +5,8 @@ import java.sql.DriverPropertyInfo;
 import java.sql.SQLException;
 import java.util.Properties;
 
+import com.alibaba.druid.hdriver.impl.HBaseConnectionImpl;
 import com.alibaba.druid.hdriver.impl.HEngine;
-import com.alibaba.druid.hdriver.impl.jdbc.HBaseConnectionImpl;
 
 public class HDriver implements Driver {
 
diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HBaseConnectionImpl.java b/src/main/java/com/alibaba/druid/hdriver/impl/HBaseConnectionImpl.java
similarity index 98%
rename from src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HBaseConnectionImpl.java
rename to src/main/java/com/alibaba/druid/hdriver/impl/HBaseConnectionImpl.java
index 74fbe60a7d..7276f7cd62 100644
--- a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HBaseConnectionImpl.java
+++ b/src/main/java/com/alibaba/druid/hdriver/impl/HBaseConnectionImpl.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.hdriver.impl.jdbc;
+package com.alibaba.druid.hdriver.impl;
 
 import java.sql.Array;
 import java.sql.Blob;
@@ -22,7 +22,6 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.client.HTableInterface;
 
 import com.alibaba.druid.hdriver.HConnection;
-import com.alibaba.druid.hdriver.impl.HEngine;
 import com.alibaba.druid.util.jdbc.ConnectionBase;
 
 public class HBaseConnectionImpl extends ConnectionBase implements HConnection {
diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatementImpl.java b/src/main/java/com/alibaba/druid/hdriver/impl/HPreparedStatementImpl.java
similarity index 99%
rename from src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatementImpl.java
rename to src/main/java/com/alibaba/druid/hdriver/impl/HPreparedStatementImpl.java
index 055ad8ddd9..7a5662286f 100644
--- a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatementImpl.java
+++ b/src/main/java/com/alibaba/druid/hdriver/impl/HPreparedStatementImpl.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.hdriver.impl.jdbc;
+package com.alibaba.druid.hdriver.impl;
 
 import java.sql.SQLException;
 import java.sql.Types;
diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HResultSetMetaData.java b/src/main/java/com/alibaba/druid/hdriver/impl/HResultSetMetaData.java
similarity index 73%
rename from src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HResultSetMetaData.java
rename to src/main/java/com/alibaba/druid/hdriver/impl/HResultSetMetaData.java
index c1601669b3..cc807ba46a 100644
--- a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HResultSetMetaData.java
+++ b/src/main/java/com/alibaba/druid/hdriver/impl/HResultSetMetaData.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.hdriver.impl.jdbc;
+package com.alibaba.druid.hdriver.impl;
 
 import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase;
 
diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HScannerResultSet.java b/src/main/java/com/alibaba/druid/hdriver/impl/HScannerResultSet.java
similarity index 99%
rename from src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HScannerResultSet.java
rename to src/main/java/com/alibaba/druid/hdriver/impl/HScannerResultSet.java
index 9875f09a07..2dabc248e3 100644
--- a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HScannerResultSet.java
+++ b/src/main/java/com/alibaba/druid/hdriver/impl/HScannerResultSet.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.hdriver.impl.jdbc;
+package com.alibaba.druid.hdriver.impl;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatementImpl.java b/src/main/java/com/alibaba/druid/hdriver/impl/HStatementImpl.java
similarity index 93%
rename from src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatementImpl.java
rename to src/main/java/com/alibaba/druid/hdriver/impl/HStatementImpl.java
index 046fd44c31..05be498b2d 100644
--- a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatementImpl.java
+++ b/src/main/java/com/alibaba/druid/hdriver/impl/HStatementImpl.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.hdriver.impl.jdbc;
+package com.alibaba.druid.hdriver.impl;
 
 import java.sql.SQLException;
 import java.sql.Statement;
diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlan.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlan.java
index 2b8714ec2f..4c3aef0eab 100644
--- a/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlan.java
+++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlan.java
@@ -3,7 +3,7 @@ package com.alibaba.druid.hdriver.impl.execute;
 import java.sql.SQLException;
 
 import com.alibaba.druid.hdriver.HResultSet;
-import com.alibaba.druid.hdriver.impl.jdbc.HPreparedStatementImpl;
+import com.alibaba.druid.hdriver.impl.HPreparedStatementImpl;
 
 public interface ExecutePlan {
 
diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlanAdapter.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlanAdapter.java
index 476724220d..3efe83bea1 100644
--- a/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlanAdapter.java
+++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlanAdapter.java
@@ -3,7 +3,7 @@ package com.alibaba.druid.hdriver.impl.execute;
 import java.sql.SQLException;
 
 import com.alibaba.druid.hdriver.HResultSet;
-import com.alibaba.druid.hdriver.impl.jdbc.HPreparedStatementImpl;
+import com.alibaba.druid.hdriver.impl.HPreparedStatementImpl;
 
 public class ExecutePlanAdapter implements ExecutePlan {
 
diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/execute/InsertExecutePlan.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/InsertExecutePlan.java
index fd2254bf3c..b1cd9d1299 100644
--- a/src/main/java/com/alibaba/druid/hdriver/impl/execute/InsertExecutePlan.java
+++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/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.hdriver.impl.jdbc.HBaseConnectionImpl;
-import com.alibaba.druid.hdriver.impl.jdbc.HPreparedStatementImpl;
+import com.alibaba.druid.hdriver.impl.HBaseConnectionImpl;
+import com.alibaba.druid.hdriver.impl.HPreparedStatementImpl;
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils;
 
diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/execute/ShowTablesPlan.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ShowTablesPlan.java
index be432ea574..655ac2b0fe 100644
--- a/src/main/java/com/alibaba/druid/hdriver/impl/execute/ShowTablesPlan.java
+++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ShowTablesPlan.java
@@ -10,8 +10,8 @@ import org.apache.hadoop.hbase.client.HBaseAdmin;
 
 import com.alibaba.druid.hdriver.HResultSet;
 import com.alibaba.druid.hdriver.HStatement;
-import com.alibaba.druid.hdriver.impl.jdbc.HPreparedStatementImpl;
-import com.alibaba.druid.hdriver.impl.jdbc.HResultSetMetaData;
+import com.alibaba.druid.hdriver.impl.HPreparedStatementImpl;
+import com.alibaba.druid.hdriver.impl.HResultSetMetaData;
 import com.alibaba.druid.util.jdbc.ResultSetBase;
 import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData;
 
diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/execute/SingleTableQueryExecutePlan.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/SingleTableQueryExecutePlan.java
index a7f75feec6..0dc0354437 100644
--- a/src/main/java/com/alibaba/druid/hdriver/impl/execute/SingleTableQueryExecutePlan.java
+++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/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.hdriver.impl.jdbc.HBaseConnectionImpl;
-import com.alibaba.druid.hdriver.impl.jdbc.HPreparedStatementImpl;
-import com.alibaba.druid.hdriver.impl.jdbc.HResultSetMetaData;
-import com.alibaba.druid.hdriver.impl.jdbc.HScannerResultSet;
+import com.alibaba.druid.hdriver.impl.HBaseConnectionImpl;
+import com.alibaba.druid.hdriver.impl.HPreparedStatementImpl;
+import com.alibaba.druid.hdriver.impl.HResultSetMetaData;
+import com.alibaba.druid.hdriver.impl.HScannerResultSet;
 import com.alibaba.druid.hdriver.impl.mapping.HMappingTable;
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;