diff --git a/mariadb-dialect/pom.xml b/dialects/mariadb-dialect/pom.xml
similarity index 95%
rename from mariadb-dialect/pom.xml
rename to dialects/mariadb-dialect/pom.xml
index bc179ade..70f8683b 100644
--- a/mariadb-dialect/pom.xml
+++ b/dialects/mariadb-dialect/pom.xml
@@ -6,8 +6,7 @@
io.9tiger
db2rest-parent
${revision}
- ../pom.xml
-
+ ../../pom.xml
diff --git a/mariadb-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MariaDBDialect.java b/dialects/mariadb-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MariaDBDialect.java
similarity index 100%
rename from mariadb-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MariaDBDialect.java
rename to dialects/mariadb-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MariaDBDialect.java
diff --git a/mssql-dialect/pom.xml b/dialects/mssql-dialect/pom.xml
similarity index 95%
rename from mssql-dialect/pom.xml
rename to dialects/mssql-dialect/pom.xml
index 230c0b28..3d7e1bc7 100644
--- a/mssql-dialect/pom.xml
+++ b/dialects/mssql-dialect/pom.xml
@@ -7,7 +7,7 @@
io.9tiger
db2rest-parent
${revision}
- ../pom.xml
+ ../../pom.xml
diff --git a/mssql-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MsSQLServerDialect.java b/dialects/mssql-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MsSQLServerDialect.java
similarity index 100%
rename from mssql-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MsSQLServerDialect.java
rename to dialects/mssql-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MsSQLServerDialect.java
diff --git a/mysql-dialect/pom.xml b/dialects/mysql-dialect/pom.xml
similarity index 95%
rename from mysql-dialect/pom.xml
rename to dialects/mysql-dialect/pom.xml
index 113d9fe6..9fb0efa1 100644
--- a/mysql-dialect/pom.xml
+++ b/dialects/mysql-dialect/pom.xml
@@ -6,8 +6,7 @@
io.9tiger
db2rest-parent
${revision}
- ../pom.xml
-
+ ../../pom.xml
diff --git a/mysql-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MySQLDialect.java b/dialects/mysql-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MySQLDialect.java
similarity index 100%
rename from mysql-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MySQLDialect.java
rename to dialects/mysql-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MySQLDialect.java
diff --git a/oracle-dialect/pom.xml b/dialects/oracle-dialect/pom.xml
similarity index 95%
rename from oracle-dialect/pom.xml
rename to dialects/oracle-dialect/pom.xml
index 89a8eb9c..a476013d 100644
--- a/oracle-dialect/pom.xml
+++ b/dialects/oracle-dialect/pom.xml
@@ -6,8 +6,7 @@
io.9tiger
db2rest-parent
${revision}
- ../pom.xml
-
+ ../../pom.xml
diff --git a/oracle-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/OracleDialect.java b/dialects/oracle-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/OracleDialect.java
similarity index 100%
rename from oracle-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/OracleDialect.java
rename to dialects/oracle-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/OracleDialect.java
diff --git a/oracle9i-dialect/pom.xml b/dialects/oracle9i-dialect/pom.xml
similarity index 95%
rename from oracle9i-dialect/pom.xml
rename to dialects/oracle9i-dialect/pom.xml
index 762d8711..575c8a98 100644
--- a/oracle9i-dialect/pom.xml
+++ b/dialects/oracle9i-dialect/pom.xml
@@ -6,8 +6,7 @@
io.9tiger
db2rest-parent
${revision}
- ../pom.xml
-
+ ../../pom.xml
diff --git a/oracle9i-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/OracleDialect.java b/dialects/oracle9i-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/OracleDialect.java
similarity index 100%
rename from oracle9i-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/OracleDialect.java
rename to dialects/oracle9i-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/OracleDialect.java
diff --git a/pg-dialect/pom.xml b/dialects/pg-dialect/pom.xml
similarity index 95%
rename from pg-dialect/pom.xml
rename to dialects/pg-dialect/pom.xml
index 36cc08ef..dcc60d71 100644
--- a/pg-dialect/pom.xml
+++ b/dialects/pg-dialect/pom.xml
@@ -6,8 +6,7 @@
io.9tiger
db2rest-parent
${revision}
- ../pom.xml
-
+ ../../pom.xml
diff --git a/pg-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/PostGreSQLDialect.java b/dialects/pg-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/PostGreSQLDialect.java
similarity index 100%
rename from pg-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/PostGreSQLDialect.java
rename to dialects/pg-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/PostGreSQLDialect.java
diff --git a/pg-dialect/src/main/java/com/homihq/db2rest/jdbc/config/driver/EnvVarSSLSocketFactory.java b/dialects/pg-dialect/src/main/java/com/homihq/db2rest/jdbc/config/driver/EnvVarSSLSocketFactory.java
similarity index 100%
rename from pg-dialect/src/main/java/com/homihq/db2rest/jdbc/config/driver/EnvVarSSLSocketFactory.java
rename to dialects/pg-dialect/src/main/java/com/homihq/db2rest/jdbc/config/driver/EnvVarSSLSocketFactory.java
diff --git a/pg-dialect/src/main/java/com/homihq/db2rest/jdbc/config/driver/PgSingleCertValidatingFactory.java b/dialects/pg-dialect/src/main/java/com/homihq/db2rest/jdbc/config/driver/PgSingleCertValidatingFactory.java
similarity index 100%
rename from pg-dialect/src/main/java/com/homihq/db2rest/jdbc/config/driver/PgSingleCertValidatingFactory.java
rename to dialects/pg-dialect/src/main/java/com/homihq/db2rest/jdbc/config/driver/PgSingleCertValidatingFactory.java
diff --git a/pom.xml b/pom.xml
index 475b9627..54ed8589 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,12 +89,12 @@
auth
mongo-support
rest-common
- pg-dialect
- mssql-dialect
- mysql-dialect
- mariadb-dialect
- oracle-dialect
- oracle9i-dialect
+ dialects/pg-dialect
+ dialects/mssql-dialect
+ dialects/mysql-dialect
+ dialects/mariadb-dialect
+ dialects/oracle-dialect
+ dialects/oracle9i-dialect
rdbms-common
db2rest-common
rdbms-support