diff --git a/flinkx-connectors/flinkx-connector-binlog/pom.xml b/flinkx-connectors/flinkx-connector-binlog/pom.xml
index cd3ec9926d..4cc991f0c3 100644
--- a/flinkx-connectors/flinkx-connector-binlog/pom.xml
+++ b/flinkx-connectors/flinkx-connector-binlog/pom.xml
@@ -176,12 +176,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/binlog"
+								<copy todir="${basedir}/../../${dist.dir}/connector/binlog"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/binlog/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/binlog/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/binlog/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/binlog/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/binlog/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/binlog/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-cassandra/pom.xml b/flinkx-connectors/flinkx-connector-cassandra/pom.xml
index 24e5c47f90..f1d28a5c59 100644
--- a/flinkx-connectors/flinkx-connector-cassandra/pom.xml
+++ b/flinkx-connectors/flinkx-connector-cassandra/pom.xml
@@ -61,15 +61,15 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/cassandra">
+								<copy todir="${basedir}/../../${dist.dir}/connector/cassandra">
 									<fileset dir="target/">
 										<include name="${artifactId}-${project.version}.jar"/>
 									</fileset>
 								</copy>
 								<!--suppress UnresolvedMavenProperty -->
 								<move
-									file="${basedir}/../../${dist.dir}/cassandra/${artifactId}-${project.version}.jar"
-									tofile="${basedir}/../../${dist.dir}/cassandra/${artifactId}-${git.branch}.jar"/>
+									file="${basedir}/../../${dist.dir}/connector/cassandra/${artifactId}-${project.version}.jar"
+									tofile="${basedir}/../../${dist.dir}/connector/cassandra/${artifactId}-${git.branch}.jar"/>
 							</tasks>
 						</configuration>
 					</execution>
diff --git a/flinkx-connectors/flinkx-connector-clickhouse/pom.xml b/flinkx-connectors/flinkx-connector-clickhouse/pom.xml
index f6e30b4e7d..e92d147ad4 100644
--- a/flinkx-connectors/flinkx-connector-clickhouse/pom.xml
+++ b/flinkx-connectors/flinkx-connector-clickhouse/pom.xml
@@ -44,12 +44,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/clickhouse/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/clickhouse/"
 									  file="${basedir}/target/${artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/clickhouse/${artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/clickhouse/${artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/clickhouse/${artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/clickhouse/${artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/clickhouse/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/clickhouse/"
 											 includes="${artifactId}-*.jar"
 											 excludes="${artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-db2/pom.xml b/flinkx-connectors/flinkx-connector-db2/pom.xml
index ca47cb369a..844e8d1dfc 100644
--- a/flinkx-connectors/flinkx-connector-db2/pom.xml
+++ b/flinkx-connectors/flinkx-connector-db2/pom.xml
@@ -77,12 +77,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/db2/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/db2/"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/db2/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/db2/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/db2/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/db2/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/db2/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/db2/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-dm/pom.xml b/flinkx-connectors/flinkx-connector-dm/pom.xml
index 4ead58380c..efb25d8761 100644
--- a/flinkx-connectors/flinkx-connector-dm/pom.xml
+++ b/flinkx-connectors/flinkx-connector-dm/pom.xml
@@ -44,14 +44,14 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/dm/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/dm/"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
 								<!--suppress UnresolvedMavenProperty -->
-								<move file="${basedir}/../../${dist.dir}/dm/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/dm/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/dm/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/dm/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
 									<!--suppress UnresolvedMavenProperty -->
-									<fileset dir="${basedir}/../../${dist.dir}/dm/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/dm/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/pom.xml b/flinkx-connectors/flinkx-connector-elasticsearch5/pom.xml
index 381635e2f7..76a460ec52 100644
--- a/flinkx-connectors/flinkx-connector-elasticsearch5/pom.xml
+++ b/flinkx-connectors/flinkx-connector-elasticsearch5/pom.xml
@@ -117,12 +117,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/elasticsearch5/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/elasticsearch5/"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/elasticsearch5/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/elasticsearch5/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/elasticsearch5/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/elasticsearch5/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/elasticsearch5/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/elasticsearch5/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/pom.xml b/flinkx-connectors/flinkx-connector-elasticsearch6/pom.xml
index 85730c0408..4650e6e319 100644
--- a/flinkx-connectors/flinkx-connector-elasticsearch6/pom.xml
+++ b/flinkx-connectors/flinkx-connector-elasticsearch6/pom.xml
@@ -95,12 +95,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/es/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/es/"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/es/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/es/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/es/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/es/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/es/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/es/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/pom.xml b/flinkx-connectors/flinkx-connector-elasticsearch7/pom.xml
index 7223bbf167..6dd5a67f97 100644
--- a/flinkx-connectors/flinkx-connector-elasticsearch7/pom.xml
+++ b/flinkx-connectors/flinkx-connector-elasticsearch7/pom.xml
@@ -112,12 +112,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/elasticsearch7/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/elasticsearch7/"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/elasticsearch7/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/elasticsearch7/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/elasticsearch7/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/elasticsearch7/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/elasticsearch7/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/elasticsearch7/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-emqx/pom.xml b/flinkx-connectors/flinkx-connector-emqx/pom.xml
index 716ee2dced..a0a4b2b29b 100644
--- a/flinkx-connectors/flinkx-connector-emqx/pom.xml
+++ b/flinkx-connectors/flinkx-connector-emqx/pom.xml
@@ -71,12 +71,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/emqx/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/emqx/"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/emqx/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/emqx/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/emqx/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/emqx/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/emqx/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/emqx/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-file/pom.xml b/flinkx-connectors/flinkx-connector-file/pom.xml
index 52c3946fdc..521d680750 100644
--- a/flinkx-connectors/flinkx-connector-file/pom.xml
+++ b/flinkx-connectors/flinkx-connector-file/pom.xml
@@ -49,12 +49,12 @@ under the License.
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/file/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/file/"
 									  file="${basedir}/target/${artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/file/${artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/file/${artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/file/${artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/file/${artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/file/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/file/"
 											 includes="${artifactId}-*.jar"
 											 excludes="${artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-ftp/pom.xml b/flinkx-connectors/flinkx-connector-ftp/pom.xml
index c854577254..3e4a287ad7 100644
--- a/flinkx-connectors/flinkx-connector-ftp/pom.xml
+++ b/flinkx-connectors/flinkx-connector-ftp/pom.xml
@@ -65,12 +65,12 @@ under the License.
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/ftp/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/ftp/"
 									  file="${basedir}/target/${artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/ftp/${artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/ftp/${artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/ftp/${artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/ftp/${artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/ftp/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/ftp/"
 											 includes="${artifactId}-*.jar"
 											 excludes="${artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-gbase/pom.xml b/flinkx-connectors/flinkx-connector-gbase/pom.xml
index 8f08dbffa9..3789a49f01 100644
--- a/flinkx-connectors/flinkx-connector-gbase/pom.xml
+++ b/flinkx-connectors/flinkx-connector-gbase/pom.xml
@@ -43,14 +43,14 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/gbase/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/gbase/"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
 								<!--suppress UnresolvedMavenProperty -->
-								<move file="${basedir}/../../${dist.dir}/gbase/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/gbase/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/gbase/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/gbase/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
 									<!--suppress UnresolvedMavenProperty -->
-									<fileset dir="${basedir}/../../${dist.dir}/gbase/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/gbase/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-greenplum/pom.xml b/flinkx-connectors/flinkx-connector-greenplum/pom.xml
index d92d9b7c18..634a96672c 100644
--- a/flinkx-connectors/flinkx-connector-greenplum/pom.xml
+++ b/flinkx-connectors/flinkx-connector-greenplum/pom.xml
@@ -73,14 +73,14 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/greenplum/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/greenplum/"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
 								<!--suppress UnresolvedMavenProperty -->
-								<move file="${basedir}/../../${dist.dir}/greenplum/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/greenplum/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/greenplum/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/greenplum/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
 									<!--suppress UnresolvedMavenProperty -->
-									<fileset dir="${basedir}/../../${dist.dir}/greenplum/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/greenplum/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/pom.xml b/flinkx-connectors/flinkx-connector-hbase-1.4/pom.xml
index f17d2a2cb0..9fd677a5d9 100644
--- a/flinkx-connectors/flinkx-connector-hbase-1.4/pom.xml
+++ b/flinkx-connectors/flinkx-connector-hbase-1.4/pom.xml
@@ -306,23 +306,23 @@
 							<tasks>
 								<move file="${basedir}/target/hbase-1.4/original-${project.artifactId}-${project.version}.jar"
 									  tofile="${basedir}/target/hbase-1.4/${project.artifactId}-${project.version}.jar"/>
-								<copy todir="${basedir}/../../${dist.dir}/hbase-1.4/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/hbase-1.4/"
 									  file="${basedir}/target/hbase-1.4/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/hbase-1.4/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/hbase-1.4/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/hbase-1.4/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/hbase-1.4/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/hbase-1.4/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/hbase-1.4/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
 								<move file="${basedir}/target/hbase-2.2/original-${project.artifactId}-${project.version}.jar"
 									  tofile="${basedir}/target/hbase-2.2/${project.artifactId}-${project.version}.jar"/>
-								<copy todir="${basedir}/../../${dist.dir}/hbase-2.2/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/hbase-2.2/"
 									  file="${basedir}/target/hbase-2.2/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/hbase-2.2/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/hbase-2.2/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/hbase-2.2/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/hbase-2.2/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/hbase-2.2/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/hbase-2.2/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-hdfs/pom.xml b/flinkx-connectors/flinkx-connector-hdfs/pom.xml
index 79ca1d9fd6..62f0aa99ff 100644
--- a/flinkx-connectors/flinkx-connector-hdfs/pom.xml
+++ b/flinkx-connectors/flinkx-connector-hdfs/pom.xml
@@ -198,14 +198,14 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy todir="${basedir}/../../${dist.dir}/hdfs"
+                                <copy todir="${basedir}/../../${dist.dir}/connector/hdfs"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
                                 <!--suppress UnresolvedMavenProperty -->
-								<move file="${basedir}/../../${dist.dir}/hdfs/${project.artifactId}-${project.version}.jar"
-                                      tofile="${basedir}/../../${dist.dir}/hdfs/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/hdfs/${project.artifactId}-${project.version}.jar"
+                                      tofile="${basedir}/../../${dist.dir}/connector/hdfs/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
 									<!--suppress UnresolvedMavenProperty -->
-									<fileset dir="${basedir}/../../${dist.dir}/hdfs/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/hdfs/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-hive/pom.xml b/flinkx-connectors/flinkx-connector-hive/pom.xml
index d88ce1cff5..3e7acff31c 100644
--- a/flinkx-connectors/flinkx-connector-hive/pom.xml
+++ b/flinkx-connectors/flinkx-connector-hive/pom.xml
@@ -260,15 +260,15 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/hive"
+								<copy todir="${basedir}/../../${dist.dir}/connector/hive"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
 								<!--suppress UnresolvedMavenProperty -->
 								<move
-									file="${basedir}/../../${dist.dir}/hive/${project.artifactId}-${project.version}.jar"
-									tofile="${basedir}/../../${dist.dir}/hive/${project.artifactId}-${git.branch}.jar"/>
+									file="${basedir}/../../${dist.dir}/connector/hive/${project.artifactId}-${project.version}.jar"
+									tofile="${basedir}/../../${dist.dir}/connector/hive/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
 									<!--suppress UnresolvedMavenProperty -->
-									<fileset dir="${basedir}/../../${dist.dir}/hive/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/hive/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-kafka/pom.xml b/flinkx-connectors/flinkx-connector-kafka/pom.xml
index c59c3ad134..d92056c578 100644
--- a/flinkx-connectors/flinkx-connector-kafka/pom.xml
+++ b/flinkx-connectors/flinkx-connector-kafka/pom.xml
@@ -92,22 +92,22 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy todir="${basedir}/../../${dist.dir}/kafka"
+                                <copy todir="${basedir}/../../${dist.dir}/connector/kafka"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-                                <move file="${basedir}/../../${dist.dir}/kafka/${project.artifactId}-${project.version}.jar"
-                                      tofile="${basedir}/../../${dist.dir}/kafka/${project.artifactId}-${git.branch}.jar"/>
+                                <move file="${basedir}/../../${dist.dir}/connector/kafka/${project.artifactId}-${project.version}.jar"
+                                      tofile="${basedir}/../../${dist.dir}/connector/kafka/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/kafka/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/kafka/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
 
-								<copy todir="${basedir}/../../${dist.dir}/upsert-kafka"
+								<copy todir="${basedir}/../../${dist.dir}/connector/upsert-kafka"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/upsert-kafka/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/upsert-kafka/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/upsert-kafka/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/upsert-kafka/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/upsert-kafka/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/upsert-kafka/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-kingbase/pom.xml b/flinkx-connectors/flinkx-connector-kingbase/pom.xml
index 102d01d715..43320eb45b 100644
--- a/flinkx-connectors/flinkx-connector-kingbase/pom.xml
+++ b/flinkx-connectors/flinkx-connector-kingbase/pom.xml
@@ -44,15 +44,17 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/kingbase">
-									<fileset dir="target/">
-										<include name="${artifactId}-${project.version}.jar"/>
-									</fileset>
-								</copy>
+								<copy todir="${basedir}/../../${dist.dir}/connector/kingbase/"
+									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
 								<!--suppress UnresolvedMavenProperty -->
-								<move
-									file="${basedir}/../../${dist.dir}/kingbase/${artifactId}-${project.version}.jar"
-									tofile="${basedir}/../../${dist.dir}/kingbase/${artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/kingbase/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/kingbase/${project.artifactId}-${git.branch}.jar"/>
+								<delete>
+									<!--suppress UnresolvedMavenProperty -->
+									<fileset dir="${basedir}/../../${dist.dir}/connector/kingbase/"
+											 includes="${project.artifactId}-*.jar"
+											 excludes="${project.artifactId}-${git.branch}.jar"/>
+								</delete>
 							</tasks>
 						</configuration>
 					</execution>
diff --git a/flinkx-connectors/flinkx-connector-kudu/pom.xml b/flinkx-connectors/flinkx-connector-kudu/pom.xml
index 82483467ac..de07a17487 100644
--- a/flinkx-connectors/flinkx-connector-kudu/pom.xml
+++ b/flinkx-connectors/flinkx-connector-kudu/pom.xml
@@ -76,13 +76,13 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/kudu"
+								<copy todir="${basedir}/../../${dist.dir}/connector/kudu"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
 								<move
-									file="${basedir}/../../${dist.dir}/kudu/${project.artifactId}-${project.version}.jar"
-									tofile="${basedir}/../../${dist.dir}/kudu/${project.artifactId}-${git.branch}.jar"/>
+									file="${basedir}/../../${dist.dir}/connector/kudu/${project.artifactId}-${project.version}.jar"
+									tofile="${basedir}/../../${dist.dir}/connector/kudu/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/kudu/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/kudu/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-mongodb/pom.xml b/flinkx-connectors/flinkx-connector-mongodb/pom.xml
index 022ac27277..e89c842bc3 100644
--- a/flinkx-connectors/flinkx-connector-mongodb/pom.xml
+++ b/flinkx-connectors/flinkx-connector-mongodb/pom.xml
@@ -32,7 +32,6 @@
 
 	<properties>
 		<mongo.version>3.11.3</mongo.version>
-		<dir.name>mongodb</dir.name>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -71,15 +70,17 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/${dir.name}">
-									<fileset dir="target/">
-										<include name="${artifactId}-${project.version}.jar"/>
-									</fileset>
-								</copy>
+								<copy todir="${basedir}/../../${dist.dir}/connector/mongodb/"
+									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
 								<!--suppress UnresolvedMavenProperty -->
-								<move
-									file="${basedir}/../../${dist.dir}/${dir.name}/${artifactId}-${project.version}.jar"
-									tofile="${basedir}/../../${dist.dir}/${dir.name}/${artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/mongodb/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/mongodb/${project.artifactId}-${git.branch}.jar"/>
+								<delete>
+									<!--suppress UnresolvedMavenProperty -->
+									<fileset dir="${basedir}/../../${dist.dir}/connector/mongodb/"
+											 includes="${project.artifactId}-*.jar"
+											 excludes="${project.artifactId}-${git.branch}.jar"/>
+								</delete>
 							</tasks>
 						</configuration>
 					</execution>
diff --git a/flinkx-connectors/flinkx-connector-mysql/pom.xml b/flinkx-connectors/flinkx-connector-mysql/pom.xml
index 9d6a54cc22..f95468e471 100644
--- a/flinkx-connectors/flinkx-connector-mysql/pom.xml
+++ b/flinkx-connectors/flinkx-connector-mysql/pom.xml
@@ -73,12 +73,14 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/mysql/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/mysql/"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/mysql/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/mysql/${project.artifactId}-${git.branch}.jar"/>
+								<!--suppress UnresolvedMavenProperty -->
+								<move file="${basedir}/../../${dist.dir}/connector/mysql/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/mysql/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/mysql/"
+									<!--suppress UnresolvedMavenProperty -->
+									<fileset dir="${basedir}/../../${dist.dir}/connector/mysql/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-oracle/pom.xml b/flinkx-connectors/flinkx-connector-oracle/pom.xml
index 59bc4de381..d3262dfd01 100644
--- a/flinkx-connectors/flinkx-connector-oracle/pom.xml
+++ b/flinkx-connectors/flinkx-connector-oracle/pom.xml
@@ -46,12 +46,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/oracle/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/oracle/"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/oracle/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/oracle/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/oracle/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/oracle/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/oracle/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/oracle/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/pom.xml b/flinkx-connectors/flinkx-connector-oraclelogminer/pom.xml
index f125f4f0cf..d5da61f45d 100644
--- a/flinkx-connectors/flinkx-connector-oraclelogminer/pom.xml
+++ b/flinkx-connectors/flinkx-connector-oraclelogminer/pom.xml
@@ -103,12 +103,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/oraclelogminer"
+								<copy todir="${basedir}/../../${dist.dir}/connector/oraclelogminer"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/oraclelogminer/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/oraclelogminer/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/oraclelogminer/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/oraclelogminer/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/oraclelogminer/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/oraclelogminer/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-pgwal/pom.xml b/flinkx-connectors/flinkx-connector-pgwal/pom.xml
index 897fec8d3a..9eebbb14ae 100644
--- a/flinkx-connectors/flinkx-connector-pgwal/pom.xml
+++ b/flinkx-connectors/flinkx-connector-pgwal/pom.xml
@@ -179,12 +179,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/pgwal"
+								<copy todir="${basedir}/../../${dist.dir}/connector/pgwal"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/pgwal/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/pgwal/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/pgwal/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/pgwal/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/pgwal/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/pgwal/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-phoenix5/pom.xml b/flinkx-connectors/flinkx-connector-phoenix5/pom.xml
index df18388928..cfff33405e 100644
--- a/flinkx-connectors/flinkx-connector-phoenix5/pom.xml
+++ b/flinkx-connectors/flinkx-connector-phoenix5/pom.xml
@@ -193,12 +193,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/${dir.name}"
+								<copy todir="${basedir}/../../${dist.dir}/connector/${dir.name}"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/${dir.name}/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/${dir.name}/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/${dir.name}/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/${dir.name}/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/${dir.name}/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/${dir.name}/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-postgresql/pom.xml b/flinkx-connectors/flinkx-connector-postgresql/pom.xml
index 9ec801e4db..de59607dd7 100644
--- a/flinkx-connectors/flinkx-connector-postgresql/pom.xml
+++ b/flinkx-connectors/flinkx-connector-postgresql/pom.xml
@@ -49,15 +49,17 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/${dir.name}">
-									<fileset dir="target/">
-										<include name="${artifactId}-${project.version}.jar"/>
-									</fileset>
-								</copy>
+								<copy todir="${basedir}/../../${dist.dir}/connector/postgresql/"
+									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
 								<!--suppress UnresolvedMavenProperty -->
-								<move
-									file="${basedir}/../../${dist.dir}/${dir.name}/${artifactId}-${project.version}.jar"
-									tofile="${basedir}/../../${dist.dir}/${dir.name}/${artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/postgresql/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/postgresql/${project.artifactId}-${git.branch}.jar"/>
+								<delete>
+									<!--suppress UnresolvedMavenProperty -->
+									<fileset dir="${basedir}/../../${dist.dir}/connector/postgresql/"
+											 includes="${project.artifactId}-*.jar"
+											 excludes="${project.artifactId}-${git.branch}.jar"/>
+								</delete>
 							</tasks>
 						</configuration>
 					</execution>
diff --git a/flinkx-connectors/flinkx-connector-redis/pom.xml b/flinkx-connectors/flinkx-connector-redis/pom.xml
index 45dad6669b..71614f4de4 100644
--- a/flinkx-connectors/flinkx-connector-redis/pom.xml
+++ b/flinkx-connectors/flinkx-connector-redis/pom.xml
@@ -79,12 +79,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/redis/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/redis/"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/redis/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/redis/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/redis/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/redis/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/redis/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/redis/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-restapi/pom.xml b/flinkx-connectors/flinkx-connector-restapi/pom.xml
index 1f9596c55f..c21560faa1 100644
--- a/flinkx-connectors/flinkx-connector-restapi/pom.xml
+++ b/flinkx-connectors/flinkx-connector-restapi/pom.xml
@@ -69,12 +69,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/restapi"
+								<copy todir="${basedir}/../../${dist.dir}/connector/restapi"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/restapi/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/restapi/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/restapi/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/restapi/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/restapi/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/restapi/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-saphana/pom.xml b/flinkx-connectors/flinkx-connector-saphana/pom.xml
index 1fd2f4da58..b9ce1ff7fb 100644
--- a/flinkx-connectors/flinkx-connector-saphana/pom.xml
+++ b/flinkx-connectors/flinkx-connector-saphana/pom.xml
@@ -45,12 +45,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/saphana/"
+								<copy todir="${basedir}/../../${dist.dir}/connector/saphana/"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/saphana/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/saphana/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/saphana/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/saphana/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/saphana/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/saphana/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-socket/pom.xml b/flinkx-connectors/flinkx-connector-socket/pom.xml
index 3582c61248..dd0ddb779e 100644
--- a/flinkx-connectors/flinkx-connector-socket/pom.xml
+++ b/flinkx-connectors/flinkx-connector-socket/pom.xml
@@ -77,12 +77,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/socket"
+								<copy todir="${basedir}/../../${dist.dir}/connector/socket"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/socket/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/socket/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/socket/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/socket/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/socket/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/socket/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-solr/pom.xml b/flinkx-connectors/flinkx-connector-solr/pom.xml
index 14f8588b47..7ef613de97 100644
--- a/flinkx-connectors/flinkx-connector-solr/pom.xml
+++ b/flinkx-connectors/flinkx-connector-solr/pom.xml
@@ -29,10 +29,6 @@
 
 	<artifactId>flinkx-connector-solr</artifactId>
 
-	<properties>
-		<dir.name>solr</dir.name>
-	</properties>
-
 	<name>FlinkX : Connectors : Solr</name>
 
 	<dependencies>
@@ -68,15 +64,17 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/${dir.name}">
-									<fileset dir="target/">
-										<include name="${artifactId}-${project.version}.jar"/>
-									</fileset>
-								</copy>
+								<copy todir="${basedir}/../../${dist.dir}/connector/solr/"
+									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
 								<!--suppress UnresolvedMavenProperty -->
-								<move
-									file="${basedir}/../../${dist.dir}/${dir.name}/${artifactId}-${project.version}.jar"
-									tofile="${basedir}/../../${dist.dir}/${dir.name}/${artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/solr/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/solr/${project.artifactId}-${git.branch}.jar"/>
+								<delete>
+									<!--suppress UnresolvedMavenProperty -->
+									<fileset dir="${basedir}/../../${dist.dir}/connector/solr/"
+											 includes="${project.artifactId}-*.jar"
+											 excludes="${project.artifactId}-${git.branch}.jar"/>
+								</delete>
 							</tasks>
 						</configuration>
 					</execution>
diff --git a/flinkx-connectors/flinkx-connector-sqlserver/pom.xml b/flinkx-connectors/flinkx-connector-sqlserver/pom.xml
index 848c83cf85..9c3e9336f2 100644
--- a/flinkx-connectors/flinkx-connector-sqlserver/pom.xml
+++ b/flinkx-connectors/flinkx-connector-sqlserver/pom.xml
@@ -12,10 +12,6 @@
 	<artifactId>flinkx-connector-sqlserver</artifactId>
 	<name>FlinkX : Connectors : SqlServer</name>
 
-	<properties>
-		<dir.name>sqlserver</dir.name>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>com.dtstack.flinkx</groupId>
@@ -97,15 +93,17 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/${dir.name}">
-									<fileset dir="target/">
-										<include name="${artifactId}-${project.version}.jar"/>
-									</fileset>
-								</copy>
+								<copy todir="${basedir}/../../${dist.dir}/connector/sqlserver/"
+									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
 								<!--suppress UnresolvedMavenProperty -->
-								<move
-									file="${basedir}/../../${dist.dir}/${dir.name}/${artifactId}-${project.version}.jar"
-									tofile="${basedir}/../../${dist.dir}/${dir.name}/${artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/sqlserver/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/sqlserver/${project.artifactId}-${git.branch}.jar"/>
+								<delete>
+									<!--suppress UnresolvedMavenProperty -->
+									<fileset dir="${basedir}/../../${dist.dir}/connector/sqlserver/"
+											 includes="${project.artifactId}-*.jar"
+											 excludes="${project.artifactId}-${git.branch}.jar"/>
+								</delete>
 							</tasks>
 						</configuration>
 					</execution>
diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/pom.xml b/flinkx-connectors/flinkx-connector-sqlservercdc/pom.xml
index 45959e3f33..24cf291f27 100644
--- a/flinkx-connectors/flinkx-connector-sqlservercdc/pom.xml
+++ b/flinkx-connectors/flinkx-connector-sqlservercdc/pom.xml
@@ -69,12 +69,12 @@
 						</goals>
 						<configuration>
 							<tasks>
-								<copy todir="${basedir}/../../${dist.dir}/sqlServerCdc"
+								<copy todir="${basedir}/../../${dist.dir}/connector/sqlServerCdc"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-								<move file="${basedir}/../../${dist.dir}/sqlServerCdc/${project.artifactId}-${project.version}.jar"
-									  tofile="${basedir}/../../${dist.dir}/sqlServerCdc/${project.artifactId}-${git.branch}.jar"/>
+								<move file="${basedir}/../../${dist.dir}/connector/sqlServerCdc/${project.artifactId}-${project.version}.jar"
+									  tofile="${basedir}/../../${dist.dir}/connector/sqlServerCdc/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/sqlServerCdc/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/sqlServerCdc/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-connectors/flinkx-connector-stream/pom.xml b/flinkx-connectors/flinkx-connector-stream/pom.xml
index a7dac5d96f..19a6702e13 100644
--- a/flinkx-connectors/flinkx-connector-stream/pom.xml
+++ b/flinkx-connectors/flinkx-connector-stream/pom.xml
@@ -67,12 +67,12 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy todir="${basedir}/../../${dist.dir}/stream"
+                                <copy todir="${basedir}/../../${dist.dir}/connector/stream"
 									  file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
-                                <move file="${basedir}/../../${dist.dir}/stream/${project.artifactId}-${project.version}.jar"
-                                      tofile="${basedir}/../../${dist.dir}/stream/${project.artifactId}-${git.branch}.jar"/>
+                                <move file="${basedir}/../../${dist.dir}/connector/stream/${project.artifactId}-${project.version}.jar"
+                                      tofile="${basedir}/../../${dist.dir}/connector/stream/${project.artifactId}-${git.branch}.jar"/>
 								<delete>
-									<fileset dir="${basedir}/../../${dist.dir}/stream/"
+									<fileset dir="${basedir}/../../${dist.dir}/connector/stream/"
 											 includes="${project.artifactId}-*.jar"
 											 excludes="${project.artifactId}-${git.branch}.jar"/>
 								</delete>
diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/constants/ConstantValue.java b/flinkx-core/src/main/java/com/dtstack/flinkx/constants/ConstantValue.java
index db67e706f4..472586c425 100644
--- a/flinkx-core/src/main/java/com/dtstack/flinkx/constants/ConstantValue.java
+++ b/flinkx-core/src/main/java/com/dtstack/flinkx/constants/ConstantValue.java
@@ -69,4 +69,6 @@ public class ConstantValue {
     public static final long STORE_SIZE_G = 1024L * 1024 * 1024;
 
     public static final long STORE_SIZE_M = 1024L * 1024;
+
+    public static final String CONNECTOR_DIR_NAME = "connector";
 }
diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/DataSyncFactoryUtil.java b/flinkx-core/src/main/java/com/dtstack/flinkx/util/DataSyncFactoryUtil.java
index b7f330d853..a126d68dc7 100644
--- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/DataSyncFactoryUtil.java
+++ b/flinkx-core/src/main/java/com/dtstack/flinkx/util/DataSyncFactoryUtil.java
@@ -22,6 +22,7 @@
 import com.dtstack.flinkx.conf.FlinkxCommonConf;
 import com.dtstack.flinkx.conf.MetricParam;
 import com.dtstack.flinkx.conf.SyncConf;
+import com.dtstack.flinkx.constants.ConstantValue;
 import com.dtstack.flinkx.enums.OperatorType;
 import com.dtstack.flinkx.metrics.CustomReporter;
 import com.dtstack.flinkx.sink.SinkFactory;
@@ -34,6 +35,7 @@
 import org.apache.flink.configuration.PipelineOptions;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 
+import java.io.File;
 import java.lang.reflect.Constructor;
 import java.net.URL;
 import java.util.Set;
@@ -50,7 +52,10 @@ public static SourceFactory discoverSource(SyncConf config, StreamExecutionEnvir
             String pluginName = config.getJob().getReader().getName();
             String pluginClassName = PluginUtil.getPluginClassName(pluginName, OperatorType.source);
             Set<URL> urlList =
-                    PluginUtil.getJarFileDirPath(pluginName, config.getPluginRoot(), null);
+                    PluginUtil.getJarFileDirPath(
+                            pluginName,
+                            config.getPluginRoot() + File.separatorChar + ConstantValue.CONNECTOR_DIR_NAME,
+                            null);
             urlList.addAll(
                     PluginUtil.getJarFileDirPath(
                             PluginUtil.FORMATS_SUFFIX, config.getPluginRoot(), null));
@@ -113,7 +118,10 @@ public static SinkFactory discoverSink(SyncConf config) {
             String pluginName = config.getJob().getContent().get(0).getWriter().getName();
             String pluginClassName = PluginUtil.getPluginClassName(pluginName, OperatorType.sink);
             Set<URL> urlList =
-                    PluginUtil.getJarFileDirPath(pluginName, config.getPluginRoot(), null);
+                    PluginUtil.getJarFileDirPath(
+                            pluginName,
+                            config.getPluginRoot() + File.separatorChar + ConstantValue.CONNECTOR_DIR_NAME,
+                            null);
             urlList.addAll(
                     PluginUtil.getJarFileDirPath(
                             PluginUtil.FORMATS_SUFFIX, config.getPluginRoot(), null));
diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/FactoryHelper.java b/flinkx-core/src/main/java/com/dtstack/flinkx/util/FactoryHelper.java
index 67efd10c3e..c63f393859 100644
--- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/FactoryHelper.java
+++ b/flinkx-core/src/main/java/com/dtstack/flinkx/util/FactoryHelper.java
@@ -79,7 +79,12 @@ public void registerCachedFile(
                                 this.pluginLoadMode, ConstantValue.CLASS_PATH_PLUGIN_LOAD_MODE)
                         ? this.remotePluginPath
                         : this.localPluginPath;
-        String pluginJarPath = pluginPath + File.separatorChar + factoryIdentifier;
+        String pluginJarPath =
+                pluginPath
+                        + File.separatorChar
+                        + ConstantValue.CONNECTOR_DIR_NAME
+                        + File.separatorChar
+                        + factoryIdentifier;
         try {
             File pluginJarPathFile = new File(pluginJarPath);
             // 路径不存在或者不为文件夹
diff --git a/flinkx-local-test/pom.xml b/flinkx-local-test/pom.xml
index 659d5f3378..bf605a6f6b 100644
--- a/flinkx-local-test/pom.xml
+++ b/flinkx-local-test/pom.xml
@@ -351,26 +351,6 @@
 			<version>${project.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>com.dtstack.flinkx</groupId>
-			<artifactId>flinkx-connector-cassandra</artifactId>
-			<version>1.12-SNAPSHOT</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>netty-codec</artifactId>
-					<groupId>io.netty</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>netty-buffer</artifactId>
-					<groupId>io.netty</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>netty-transport</artifactId>
-					<groupId>io.netty</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
 		<dependency>
 			<groupId>com.dtstack.flinkx</groupId>
 			<artifactId>flinkx-metrics-mysql</artifactId>