diff --git a/gimel-dataapi/gimel-common/pom.xml b/gimel-dataapi/gimel-common/pom.xml
index 39726a8c..275e82be 100644
--- a/gimel-dataapi/gimel-common/pom.xml
+++ b/gimel-dataapi/gimel-common/pom.xml
@@ -150,7 +150,7 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-streaming-kafka-${kafka.binary.version}_${scala.binary.version}</artifactId>
+      <artifactId>spark-streaming-kafka-${spark.kafka.connector.version}</artifactId>
       <version>${spark.version}</version>
       <scope>${spark.packaging.scope}</scope>
     </dependency>
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase/pom.xml b/gimel-dataapi/gimel-connectors/gimel-hbase/pom.xml
index 7bf7cada..d0165507 100644
--- a/gimel-dataapi/gimel-connectors/gimel-hbase/pom.xml
+++ b/gimel-dataapi/gimel-connectors/gimel-hbase/pom.xml
@@ -47,8 +47,18 @@ under the License.
     <dependency>
       <groupId>com.hortonworks</groupId>
       <artifactId>shc-core</artifactId>
-      <version>${hortonworks.shc.version}-${spark.binary.version}-s_${scala.binary.version}</version>
+      <version>1.1.1-2.1-s_2.11</version>
       <scope>${packaging.scope}</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.spark</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.scala-lang</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
@@ -179,7 +189,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>${maven.shade.plugin.version}</version>
         <configuration>
           <relocations>
             <relocation>
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/pom.xml b/gimel-dataapi/gimel-connectors/gimel-kafka/pom.xml
similarity index 89%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/pom.xml
rename to gimel-dataapi/gimel-connectors/gimel-kafka/pom.xml
index 2dae625c..f6bba1b5 100644
--- a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/pom.xml
+++ b/gimel-dataapi/gimel-connectors/gimel-kafka/pom.xml
@@ -28,7 +28,7 @@ under the License.
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>gimel-kafka-2.2</artifactId>
+    <artifactId>gimel-kafka</artifactId>
     <version>2.4.7-SNAPSHOT</version>
 
     <dependencies>
@@ -37,6 +37,14 @@ under the License.
             <artifactId>gimel-common</artifactId>
             <version>${gimel.version}-SNAPSHOT</version>
             <exclusions>
+                <exclusion>
+                    <groupId>org.apache.hbase</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-core</artifactId>
@@ -51,23 +59,11 @@ under the License.
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.databricks</groupId>
-            <artifactId>spark-avro_${scala.binary.version}</artifactId>
-            <version>3.2.0</version>
-            <scope>${packaging.scope}</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-sql-kafka-${spark.kafka.connector.version}</artifactId>
             <version>${spark.version}</version>
             <scope>${packaging.scope}</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.kafka</groupId>
-                    <artifactId>kafka-clients</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <!--kafka Clients-->
         <dependency>
@@ -75,21 +71,6 @@ under the License.
             <artifactId>kafka-clients</artifactId>
             <version>${kafka.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
 
         <!-- Test dependencies -->
         <!-- To reuse some of the common testing utilities -->
@@ -163,12 +144,6 @@ under the License.
             <version>${confluent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.avro</groupId>
-            <artifactId>avro</artifactId>
-            <version>1.7.7</version>
-            <scope>test</scope>
-        </dependency>
         <!-- Kafka local testing utility needs Netty 3.x at test scope for the minicluster -->
         <dependency>
             <groupId>io.netty</groupId>
@@ -234,7 +209,7 @@ under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>${maven.shade.plugin.version}</version>
                 <configuration>
                     <relocations>
                         <relocation>
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/DataSet.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/DataSet.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/DataSet.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/DataSet.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/DataStream.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/DataStream.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/DataStream.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/DataStream.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaClientConfiguration.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaClientConfiguration.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaClientConfiguration.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaClientConfiguration.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaConfigs.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaConfigs.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaConfigs.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaConfigs.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaConstants.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaConstants.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaConstants.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaConstants.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaJsonProtocol.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaJsonProtocol.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaJsonProtocol.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/conf/KafkaJsonProtocol.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/reader/KafkaBatchConsumer.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/reader/KafkaBatchConsumer.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/reader/KafkaBatchConsumer.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/reader/KafkaBatchConsumer.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/reader/KafkaStreamConsumer.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/reader/KafkaStreamConsumer.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/reader/KafkaStreamConsumer.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/reader/KafkaStreamConsumer.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/utilities/ImplicitKafkaConverters.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/utilities/ImplicitKafkaConverters.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/utilities/ImplicitKafkaConverters.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/utilities/ImplicitKafkaConverters.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/utilities/ImplicitZKCheckPointers.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/utilities/ImplicitZKCheckPointers.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/utilities/ImplicitZKCheckPointers.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/utilities/ImplicitZKCheckPointers.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/utilities/KafkaOptionsLoaderUtils.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/utilities/KafkaOptionsLoaderUtils.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/utilities/KafkaOptionsLoaderUtils.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/utilities/KafkaOptionsLoaderUtils.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/utilities/KafkaUtilities.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/utilities/KafkaUtilities.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/utilities/KafkaUtilities.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/utilities/KafkaUtilities.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/writer/KafkaBatchProducer.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/writer/KafkaBatchProducer.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/writer/KafkaBatchProducer.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/writer/KafkaBatchProducer.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/writer/KafkaStreamProducer.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/writer/KafkaStreamProducer.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/main/scala/com/paypal/gimel/kafka2/writer/KafkaStreamProducer.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/main/scala/com/paypal/gimel/kafka2/writer/KafkaStreamProducer.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/DataSetTest.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/DataSetTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/DataSetTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/DataSetTest.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/reader/KafkaBatchConsumerTest.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/reader/KafkaBatchConsumerTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/reader/KafkaBatchConsumerTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/reader/KafkaBatchConsumerTest.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/utilities/ImplicitKafkaConvertersTest.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/utilities/ImplicitKafkaConvertersTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/utilities/ImplicitKafkaConvertersTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/utilities/ImplicitKafkaConvertersTest.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/utilities/ImplicitZKCheckPointersTest.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/utilities/ImplicitZKCheckPointersTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/utilities/ImplicitZKCheckPointersTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/utilities/ImplicitZKCheckPointersTest.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/utilities/KafkaOptionsLoaderUtilsTest.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/utilities/KafkaOptionsLoaderUtilsTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/utilities/KafkaOptionsLoaderUtilsTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/utilities/KafkaOptionsLoaderUtilsTest.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/utilities/KafkaUtilitiesTest.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/utilities/KafkaUtilitiesTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/utilities/KafkaUtilitiesTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/utilities/KafkaUtilitiesTest.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/utilities/MockKafkaoptionsLoader.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/utilities/MockKafkaoptionsLoader.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/utilities/MockKafkaoptionsLoader.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/utilities/MockKafkaoptionsLoader.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/writer/KafkaBatchProducerTest.scala b/gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/writer/KafkaBatchProducerTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-kafka-2.2/src/test/scala/com/paypal/gimel/kafka2/writer/KafkaBatchProducerTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-kafka/src/test/scala/com/paypal/gimel/kafka2/writer/KafkaBatchProducerTest.scala
diff --git a/gimel-dataapi/pom.xml b/gimel-dataapi/pom.xml
index 24433a6e..0146795a 100644
--- a/gimel-dataapi/pom.xml
+++ b/gimel-dataapi/pom.xml
@@ -43,11 +43,11 @@ under the License.
         <module>gimel-connectors/gimel-hive</module>
         <module>gimel-connectors/gimel-restapi</module>
         <module>gimel-connectors/gimel-s3</module>
-        <module>gimel-connectors/gimel-jdbc</module>
+        <module>gimel-connectors/gimel-kafka</module>
         <module>gimel-connectors/gimel-hbase</module>
+        <module>gimel-connectors/gimel-jdbc</module>
         <module>gimel-connectors/gimel-cassandra-2.0</module>
         <module>gimel-connectors/gimel-aerospike-3.14</module>
-        <module>gimel-connectors/gimel-kafka-2.2</module>
         <module>gimel-connectors/gimel-druid-0.82</module>
         <module>gimel-core</module>
         <module>gimel-sql</module>
@@ -67,9 +67,9 @@ under the License.
         <jackson.version>2.6.7</jackson.version>
         <java.version>1.8</java.version>
         <jersey.version>1.19.4</jersey.version>
-        <kafka.paypal.monitoring.version>1.3.2</kafka.paypal.monitoring.version>
-        <kafka.version>2.2.1</kafka.version>
-        <kafka.binary.version>0-10</kafka.binary.version>
+<!--        <kafka.paypal.monitoring.version>1.3.2</kafka.paypal.monitoring.version>-->
+        <kafka.version>2.1.1</kafka.version>
+<!--        <kafka.binary.version>0-10</kafka.binary.version>-->
         <protobuf.javaformatter.version>1.4</protobuf.javaformatter.version>
         <gimel.logging.spark.binary.version>2.3</gimel.logging.spark.binary.version>
         <gimel.logging.version>0.4.3-SNAPSHOT</gimel.logging.version>
@@ -80,7 +80,7 @@ under the License.
         <teradata.version>15.10.00.22</teradata.version>
         <zookeeper.version>3.4.13</zookeeper.version>
         <curator.version>2.13.0</curator.version>
-        <spark.kafka.connector.version>0-10_2.11</spark.kafka.connector.version>
+        <spark.kafka.connector.version>0-10_2.12</spark.kafka.connector.version>
         <spark.sftp.version>1.1.3</spark.sftp.version>
         <!-- These are added because of conflict in hbase-testing-utility-->
         <netty.hadoop.version>3.9.9.Final</netty.hadoop.version>