diff --git a/pom.xml b/pom.xml
index f3f2e07662..7340d340a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.alibaba
druid
- 0.1.11
+ 0.1.12-SNAPSHOT
druid
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/ArithmeticOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java
similarity index 99%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/ArithmeticOperatorsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java
index 0b884aa01e..cd19d06826 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/ArithmeticOperatorsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/AssignmentOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/AssignmentOperatorsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java
index b8207492f5..c53505f9e8 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/AssignmentOperatorsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/BitFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java
similarity index 99%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/BitFunctionsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java
index 5ce09e1d90..5ed5ce8816 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/BitFunctionsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/BooleanValuesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/BooleanValuesTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java
index 55323ecd1b..b42bc0fe43 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/BooleanValuesTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/CALL_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/CALL_Test.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java
index f21108b11b..e9bcb79c24 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/CALL_Test.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/CastFunctionsAndOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java
similarity index 99%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/CastFunctionsAndOperatorsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java
index ef45a388d1..6cebcc0d46 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/CastFunctionsAndOperatorsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/ComparisonFunctionsAndOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java
similarity index 99%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/ComparisonFunctionsAndOperatorsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java
index 4cee3222b6..1a84dee4c5 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/ComparisonFunctionsAndOperatorsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/ControlFlowFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/ControlFlowFunctionsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java
index 2ca01f8e59..2be0627351 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/ControlFlowFunctionsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/DateAndTimeFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java
similarity index 99%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/DateAndTimeFunctionsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java
index 96ebd5ca64..fb1295486d 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/DateAndTimeFunctionsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/DateAndTimeValuesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/DateAndTimeValuesTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java
index 56c5d915e9..240662b055 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/DateAndTimeValuesTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/DeleteSyntaxTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/DeleteSyntaxTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java
index 9e3415573b..9bb1a4c2bb 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/DeleteSyntaxTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/EncryptionAndCompressionFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/EncryptionAndCompressionFunctionsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java
index f743deb5e9..d5041c9778 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/EncryptionAndCompressionFunctionsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/FullTextSearchesWithQueryExpansionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/FullTextSearchesWithQueryExpansionTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java
index 7910768009..44b23443e7 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/FullTextSearchesWithQueryExpansionTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/HexadecimalValuesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/HexadecimalValuesTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java
index b0bfeb6c6a..b374d1f50a 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/HexadecimalValuesTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/InformationFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java
similarity index 99%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/InformationFunctionsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java
index 37340c4d07..a6f36e58ad 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/InformationFunctionsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/InsertSyntaxTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java
similarity index 99%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/InsertSyntaxTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java
index 6c653f374f..d283aa14cc 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/InsertSyntaxTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/LOAD_XML_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/LOAD_XML_Syntax_Test.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java
index e89619e0f2..7419442854 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/LOAD_XML_Syntax_Test.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/LoadDataInFileSyntaxTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/LoadDataInFileSyntaxTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java
index 9ec51c51a9..c264e00a91 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/LoadDataInFileSyntaxTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/LogicalOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java
similarity index 99%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/LogicalOperatorsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java
index 6b314621c6..da6d4ee0c0 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/LogicalOperatorsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/MathematicalFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java
similarity index 99%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/MathematicalFunctionsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java
index 5040fd9163..b0bb47a056 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/MathematicalFunctionsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/MiscellaneousFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/MiscellaneousFunctionsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java
index c220b9fe3b..23ab6704e1 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/MiscellaneousFunctionsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/MySqlParameterizedOutputVisitorTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/MySqlParameterizedOutputVisitorTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest.java
index acdfaf6052..e75b7bbe36 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/MySqlParameterizedOutputVisitorTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/NumberTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/NumberTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java
index 2ecd4f2ec0..8ab214478a 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/NumberTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/REPLACE_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/REPLACE_Syntax_Test.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java
index bb2ee5b593..6cf278286d 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/REPLACE_Syntax_Test.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/RegularExpressionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/RegularExpressionsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java
index e9e32208ac..9f62cc7d66 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/RegularExpressionsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SELECT_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java
similarity index 99%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/SELECT_Syntax_Test.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java
index 141306e5cb..995539fca9 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SELECT_Syntax_Test.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_COLUMNS_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_COLUMNS_Syntax_Test.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java
index dee290013b..bb394e3551 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_COLUMNS_Syntax_Test.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_DATABASES_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_DATABASES_Syntax_Test.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java
index f6d6e2663f..57c7279402 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_DATABASES_Syntax_Test.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_STATUS_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_STATUS_Syntax_Test.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_STATUS_Syntax_Test.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_STATUS_Syntax_Test.java
index b2ee97b87a..b8d1cd15e1 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_STATUS_Syntax_Test.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_STATUS_Syntax_Test.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_TABLES_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_TABLES_Syntax_Test.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java
index 18ad90916d..919ffa7a30 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_TABLES_Syntax_Test.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_WARNINGS_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_WARNINGS_Syntax_Test.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java
index 917b92f308..f2fb2ee449 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SHOW_WARNINGS_Syntax_Test.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SQLParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLParserTest.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/SQLParserTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLParserTest.java
index ab00ca30b2..7d6bceefd1 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SQLParserTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLParserTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import junit.framework.TestCase;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SQLSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLSelectTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/SQLSelectTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLSelectTest.java
index 193ab85869..471b5457e3 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/SQLSelectTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLSelectTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/START_TRANSACTION_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/START_TRANSACTION_Test.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java
index e01f75ed28..181105b8c3 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/START_TRANSACTION_Test.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/StringComparisonFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java
similarity index 99%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/StringComparisonFunctionsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java
index de542a2707..dfea27e37a 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/StringComparisonFunctionsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/StringFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java
similarity index 99%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/StringFunctionsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java
index 7b53368d52..ff59add0fb 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/StringFunctionsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/StringTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/StringTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java
index b2acb5dad2..891b09ba27 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/StringTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/XMLFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/XMLFunctionsTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java
index ea99feb3b3..0ad913de22 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/XMLFunctionsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.mysql.bvt;
+package com.alibaba.druid.bvt.sql.mysql;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/parser/MySqlParserResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/parser/MySqlParserResourceTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/parser/MySqlParserResourceTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/parser/MySqlParserResourceTest.java
index 63605bf96d..42f9fec8cf 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/parser/MySqlParserResourceTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/parser/MySqlParserResourceTest.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.mysql.bvt.parser;
+package com.alibaba.druid.bvt.sql.mysql.parser;
import java.io.InputStream;
import java.io.InputStreamReader;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlResourceTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java
index 1875eefc93..55ddbc723b 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlResourceTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.mysql.bvt.visitor;
+package com.alibaba.druid.bvt.sql.mysql.visitor;
import java.io.InputStream;
import java.io.InputStreamReader;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest1.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java
index 18e4309d55..d479775fc6 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest1.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.mysql.bvt.visitor;
+package com.alibaba.druid.bvt.sql.mysql.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest2.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java
index 63fe9e8af3..07dabe1d0b 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest2.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.mysql.bvt.visitor;
+package com.alibaba.druid.bvt.sql.mysql.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest3.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java
index a879080335..bb5ba5349c 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest3.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.mysql.bvt.visitor;
+package com.alibaba.druid.bvt.sql.mysql.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java
similarity index 96%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest4.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java
index 72db5b2fa3..8bc4f1b82e 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest4.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.mysql.bvt.visitor;
+package com.alibaba.druid.bvt.sql.mysql.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Delete.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java
similarity index 96%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Delete.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java
index 5a3e7f64cb..c186fb6b55 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Delete.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.mysql.bvt.visitor;
+package com.alibaba.druid.bvt.sql.mysql.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Subquery.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java
similarity index 96%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Subquery.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java
index 025887fbb6..e6e706719c 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Subquery.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.mysql.bvt.visitor;
+package com.alibaba.druid.bvt.sql.mysql.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Subquery2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Subquery2.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java
index 79c1333665..608871fa08 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Subquery2.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.mysql.bvt.visitor;
+package com.alibaba.druid.bvt.sql.mysql.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Update.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java
similarity index 96%
rename from src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Update.java
rename to src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java
index 21278d8a25..3a400828ca 100644
--- a/src/test/java/com/alibaba/druid/sql/mysql/bvt/visitor/MySqlSchemaStatVisitorTest_Update.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.mysql.bvt.visitor;
+package com.alibaba.druid.bvt.sql.mysql.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/CallTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/CallTest.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/CallTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/CallTest.java
index 69e017bc41..b9e29b6157 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/CallTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/CallTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.oracle.bvt;
+package com.alibaba.druid.bvt.sql.oracle;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/LargeOrTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/LargeOrTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java
index 61cdfeb9ba..16564f55ac 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/LargeOrTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt;
+package com.alibaba.druid.bvt.sql.oracle;
import junit.framework.Assert;
import junit.framework.TestCase;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleLexerTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLexerTest.java
similarity index 95%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleLexerTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLexerTest.java
index d6941f4ed2..17ca42b39b 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleLexerTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLexerTest.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt;
+package com.alibaba.druid.bvt.sql.oracle;
import junit.framework.TestCase;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserResourceTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java
index 6db56f6331..ce4610b733 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserResourceTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt;
+package com.alibaba.druid.bvt.sql.oracle;
import java.io.InputStream;
import java.io.InputStreamReader;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java
index fcf511d674..b8dcc19484 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt;
+package com.alibaba.druid.bvt.sql.oracle;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSelectGroupingTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectGroupingTest.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSelectGroupingTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectGroupingTest.java
index e74cbee75a..26e2d5d5a8 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSelectGroupingTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectGroupingTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.oracle.bvt;
+package com.alibaba.druid.bvt.sql.oracle;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSelectParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectParserTest.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSelectParserTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectParserTest.java
index f96455b1ae..5c5b7eb83e 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSelectParserTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectParserTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.alibaba.druid.sql.oracle.bvt;
+package com.alibaba.druid.bvt.sql.oracle;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_Aggregate.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java
similarity index 96%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_Aggregate.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java
index b4598c9de1..013bb0a401 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_Aggregate.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_dblink.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java
similarity index 96%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_dblink.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java
index d017c8e3cc..9314b4843e 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_dblink.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_delete.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java
similarity index 96%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_delete.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java
index e31cf34bc4..bfae321706 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_delete.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_forupdate.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java
similarity index 96%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_forupdate.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java
index a019256286..4a82bb3f52 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_forupdate.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_orderBy.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java
similarity index 96%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_orderBy.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java
index 71a789d0f0..058e17330d 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_orderBy.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_selectJoin.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_selectJoin.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java
index 1bc9076494..b4794460f2 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleOutputVisitorTest_selectJoin.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleResourceTest.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java
index 6ed1703650..112cd2eccf 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleResourceTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.io.InputStream;
import java.io.InputStreamReader;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest1.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java
index 3f194c09a3..86f11ff75c 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest1.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java
similarity index 98%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest2.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java
index b9f8c91e95..893f14b883 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest2.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest3.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java
index 746e5b5c4e..dd62af3bae 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest3.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java
similarity index 96%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest4.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java
index 43f4eb6578..878d652a12 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest4.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Delete.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java
similarity index 96%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Delete.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java
index fee33ec826..9e3a93cf33 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Delete.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java
similarity index 96%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java
index a64aaf87ea..be9a26a533 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java
similarity index 97%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery2.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java
index 0d3f135c4d..85d47ea527 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Subquery2.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.util.List;
diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Update.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java
similarity index 96%
rename from src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Update.java
rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java
index 3c0ad32f6a..9d1129f465 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/visitor/OracleSchemaStatVisitorTest_Update.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.sql.oracle.bvt.visitor;
+package com.alibaba.druid.bvt.sql.oracle.visitor;
import java.util.List;