diff --git a/shardingsphere-distsql-parser/pom.xml b/shardingsphere-distsql-parser/pom.xml
index 5ae5202de722d6260a598225d5743812a479a043..356ab856da8e6bd2f1243051d80d9866422d79e2 100644
--- a/shardingsphere-distsql-parser/pom.xml
+++ b/shardingsphere-distsql-parser/pom.xml
@@ -30,7 +30,6 @@
${project.artifactId}
- shardingsphere-distsql-parser-sql
shardingsphere-distsql-parser-statement
shardingsphere-distsql-parser-engine
shardingsphere-distsql-parser-binder
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/pom.xml b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/pom.xml
index 7f8a12c06ac77e1945addb3c154d1977b210bfe0..bf893ed7c0ba710b44c97c0f530161970198ba84 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/pom.xml
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/pom.xml
@@ -39,8 +39,35 @@
org.apache.shardingsphere
- shardingsphere-distsql-parser-sql
+ shardingsphere-distsql-parser-statement
+ ${project.version}
+
+
+ org.apache.shardingsphere
+ shardingsphere-sql-parser-engine
${project.version}
+
+
+
+
+ org.antlr
+ antlr4-maven-plugin
+
+
+ antlr
+
+ src/main/antlr4/imports/
+ false
+ true
+
+
+ antlr4
+
+
+
+
+
+
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Alphabet.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/Alphabet.g4
similarity index 100%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Alphabet.g4
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/Alphabet.g4
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Keyword.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/Keyword.g4
similarity index 100%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Keyword.g4
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/Keyword.g4
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Literals.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/Literals.g4
similarity index 100%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Literals.g4
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/Literals.g4
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/RDLStatement.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/RDLStatement.g4
similarity index 100%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/RDLStatement.g4
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/RDLStatement.g4
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Symbol.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/Symbol.g4
similarity index 100%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/imports/Symbol.g4
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/imports/Symbol.g4
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/DistSQLStatement.g4 b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/DistSQLStatement.g4
similarity index 100%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/DistSQLStatement.g4
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/antlr4/org/apache/shardingsphere/distsql/parser/autogen/DistSQLStatement.g4
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/DistSQLStatementParserEngine.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/api/DistSQLStatementParserEngine.java
similarity index 92%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/DistSQLStatementParserEngine.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/api/DistSQLStatementParserEngine.java
index 1e60d39c939b0d42f9d7939df61d5413b7426873..0921fd9ec4f0d0d8f9cfda4c625bce630a22def2 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/DistSQLStatementParserEngine.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/api/DistSQLStatementParserEngine.java
@@ -15,14 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser;
+package org.apache.shardingsphere.distsql.parser.api;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.Parser;
import org.antlr.v4.runtime.atn.PredictionMode;
import org.antlr.v4.runtime.misc.ParseCancellationException;
import org.antlr.v4.runtime.tree.ErrorNode;
-import org.apache.shardingsphere.distsql.parser.sql.visitor.DistSQLStatementVisitor;
+import org.apache.shardingsphere.distsql.parser.core.DistSQLParserFactory;
+import org.apache.shardingsphere.distsql.parser.core.DistSQLStatementVisitor;
import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
import org.apache.shardingsphere.sql.parser.core.parser.ParseASTNode;
import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/java/org/apache/shardingsphere/distsql/parser/sql/parser/DistSQLParser.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLParser.java
similarity index 95%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/java/org/apache/shardingsphere/distsql/parser/sql/parser/DistSQLParser.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLParser.java
index 76c972d84cdecf8aa9cf20a9851d6285ec2192ff..00e6c4705b71f7d9082fa5bc5bef580259d1c570 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/java/org/apache/shardingsphere/distsql/parser/sql/parser/DistSQLParser.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLParser.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.sql.parser;
+package org.apache.shardingsphere.distsql.parser.core;
import org.antlr.v4.runtime.TokenStream;
import org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementParser;
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/DistSQLParserFactory.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLParserFactory.java
similarity index 94%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/DistSQLParserFactory.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLParserFactory.java
index 5c6c006937d221046e4d507f56a56bf9e8a468cc..1654a9648f3977475f19f92667552ddf53bd6b36 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/DistSQLParserFactory.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLParserFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser;
+package org.apache.shardingsphere.distsql.parser.core;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -26,7 +26,6 @@ import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.TokenStream;
import org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementLexer;
-import org.apache.shardingsphere.distsql.parser.sql.parser.DistSQLParser;
import org.apache.shardingsphere.sql.parser.api.parser.SQLParser;
import java.nio.CharBuffer;
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/java/org/apache/shardingsphere/distsql/parser/sql/visitor/DistSQLStatementVisitor.java b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLStatementVisitor.java
similarity index 98%
rename from shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/java/org/apache/shardingsphere/distsql/parser/sql/visitor/DistSQLStatementVisitor.java
rename to shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLStatementVisitor.java
index 1b16e6fab9b69bfbe14898bffdfa2d7c26085973..b89955cf8fc3d0656e84bab9413d04137913dc76 100644
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/src/main/java/org/apache/shardingsphere/distsql/parser/sql/visitor/DistSQLStatementVisitor.java
+++ b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/DistSQLStatementVisitor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.sql.visitor;
+package org.apache.shardingsphere.distsql.parser.core;
import org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementBaseVisitor;
import org.apache.shardingsphere.distsql.parser.autogen.DistSQLStatementParser.CreateDataSourcesContext;
diff --git a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/pom.xml b/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/pom.xml
deleted file mode 100644
index 175e1a7319add7577b30f768d5bd2f760bef78b6..0000000000000000000000000000000000000000
--- a/shardingsphere-distsql-parser/shardingsphere-distsql-parser-sql/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
- shardingsphere-distsql-parser
- org.apache.shardingsphere
- 5.0.0-RC1-SNAPSHOT
-
- 4.0.0
- shardingsphere-distsql-parser-sql
-
-
-
- org.apache.commons
- commons-collections4
-
-
- org.antlr
- antlr4-runtime
-
-
- org.apache.shardingsphere
- shardingsphere-distsql-parser-statement
- ${project.version}
-
-
- org.apache.shardingsphere
- shardingsphere-sql-parser-engine
- ${project.version}
-
-
-
-
-
-
- org.antlr
- antlr4-maven-plugin
-
-
- antlr
-
- src/main/antlr4/imports/
- false
- true
-
-
- antlr4
-
-
-
-
-
-
-
diff --git a/shardingsphere-infra/shardingsphere-infra-parser/src/main/java/org/apache/shardingsphere/infra/parser/ShardingSphereSQLParserEngine.java b/shardingsphere-infra/shardingsphere-infra-parser/src/main/java/org/apache/shardingsphere/infra/parser/ShardingSphereSQLParserEngine.java
index e20bef98cbad257550805da37c5139309535aee6..e96645d747a244d4d50ad6e289aab4eb9a2890d5 100644
--- a/shardingsphere-infra/shardingsphere-infra-parser/src/main/java/org/apache/shardingsphere/infra/parser/ShardingSphereSQLParserEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-parser/src/main/java/org/apache/shardingsphere/infra/parser/ShardingSphereSQLParserEngine.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.parser;
-import org.apache.shardingsphere.distsql.parser.DistSQLStatementParserEngine;
+import org.apache.shardingsphere.distsql.parser.api.DistSQLStatementParserEngine;
import org.apache.shardingsphere.infra.parser.sql.SQLStatementParserEngine;
import org.apache.shardingsphere.infra.parser.sql.SQLStatementParserEngineFactory;
import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;