diff --git a/gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/pom.xml b/gimel-dataapi/gimel-connectors/gimel-elasticsearch/pom.xml
similarity index 98%
rename from gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/pom.xml
rename to gimel-dataapi/gimel-connectors/gimel-elasticsearch/pom.xml
index 063b3600..e39db857 100644
--- a/gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/pom.xml
+++ b/gimel-dataapi/gimel-connectors/gimel-elasticsearch/pom.xml
@@ -28,7 +28,7 @@ under the License.
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>gimel-elasticsearch-6.2</artifactId>
+  <artifactId>gimel-elasticsearch</artifactId>
   <version>2.4.7-SNAPSHOT</version>
 
   <dependencies>
diff --git a/gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/src/main/scala/com/paypal/gimel/elasticsearch/DataSet.scala b/gimel-dataapi/gimel-connectors/gimel-elasticsearch/src/main/scala/com/paypal/gimel/elasticsearch/DataSet.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/src/main/scala/com/paypal/gimel/elasticsearch/DataSet.scala
rename to gimel-dataapi/gimel-connectors/gimel-elasticsearch/src/main/scala/com/paypal/gimel/elasticsearch/DataSet.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/src/main/scala/com/paypal/gimel/elasticsearch/conf/ElasticSearchConfigs.scala b/gimel-dataapi/gimel-connectors/gimel-elasticsearch/src/main/scala/com/paypal/gimel/elasticsearch/conf/ElasticSearchConfigs.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/src/main/scala/com/paypal/gimel/elasticsearch/conf/ElasticSearchConfigs.scala
rename to gimel-dataapi/gimel-connectors/gimel-elasticsearch/src/main/scala/com/paypal/gimel/elasticsearch/conf/ElasticSearchConfigs.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/src/main/scala/com/paypal/gimel/elasticsearch/conf/ElasticSearchConstants.scala b/gimel-dataapi/gimel-connectors/gimel-elasticsearch/src/main/scala/com/paypal/gimel/elasticsearch/conf/ElasticSearchConstants.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/src/main/scala/com/paypal/gimel/elasticsearch/conf/ElasticSearchConstants.scala
rename to gimel-dataapi/gimel-connectors/gimel-elasticsearch/src/main/scala/com/paypal/gimel/elasticsearch/conf/ElasticSearchConstants.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/src/main/scala/com/paypal/gimel/elasticsearch/utilities/ElasticSearchUtilities.scala b/gimel-dataapi/gimel-connectors/gimel-elasticsearch/src/main/scala/com/paypal/gimel/elasticsearch/utilities/ElasticSearchUtilities.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/src/main/scala/com/paypal/gimel/elasticsearch/utilities/ElasticSearchUtilities.scala
rename to gimel-dataapi/gimel-connectors/gimel-elasticsearch/src/main/scala/com/paypal/gimel/elasticsearch/utilities/ElasticSearchUtilities.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/pom.xml b/gimel-dataapi/gimel-connectors/gimel-hbase/pom.xml
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/pom.xml
rename to gimel-dataapi/gimel-connectors/gimel-hbase/pom.xml
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/DataSet.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/DataSet.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/DataSet.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/DataSet.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/conf/HbaseClientConfiguration.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/conf/HbaseClientConfiguration.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/conf/HbaseClientConfiguration.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/conf/HbaseClientConfiguration.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/conf/HbaseConfigs.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/conf/HbaseConfigs.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/conf/HbaseConfigs.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/conf/HbaseConfigs.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/conf/HbaseConstants.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/conf/HbaseConstants.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/conf/HbaseConstants.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/conf/HbaseConstants.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseCatalog.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseCatalog.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseCatalog.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseCatalog.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseLookUp.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseLookUp.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseLookUp.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseLookUp.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/utilities/HBasePut.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/utilities/HBasePut.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/utilities/HBasePut.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/utilities/HBasePut.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseScanner.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseScanner.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseScanner.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseScanner.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseSparkConnector.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseSparkConnector.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseSparkConnector.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseSparkConnector.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseUtilities.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseUtilities.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseUtilities.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/main/scala/com/paypal/gimel/hbase/utilities/HBaseUtilities.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/DataSetTest.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/DataSetTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/DataSetTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/DataSetTest.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseCatalogTest.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseCatalogTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseCatalogTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseCatalogTest.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseLocalClient.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseLocalClient.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseLocalClient.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseLocalClient.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseLookUpTest.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseLookUpTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseLookUpTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseLookUpTest.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/utilities/HBasePutTest.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/utilities/HBasePutTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/utilities/HBasePutTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/utilities/HBasePutTest.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseScannerTest.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseScannerTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseScannerTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseScannerTest.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseSparkConnectorTest.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseSparkConnectorTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseSparkConnectorTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseSparkConnectorTest.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseUtilitiesTest.scala b/gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseUtilitiesTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hbase-1.2/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseUtilitiesTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-hbase/src/test/scala/com/paypal/gimel/hbase/utilities/HBaseUtilitiesTest.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/pom.xml b/gimel-dataapi/gimel-connectors/gimel-hive/pom.xml
similarity index 99%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/pom.xml
rename to gimel-dataapi/gimel-connectors/gimel-hive/pom.xml
index db91c22b..f40e5ad0 100644
--- a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/pom.xml
+++ b/gimel-dataapi/gimel-connectors/gimel-hive/pom.xml
@@ -28,7 +28,7 @@ under the License.
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>gimel-hive-1.2</artifactId>
+  <artifactId>gimel-hive</artifactId>
   <version>2.4.7-SNAPSHOT</version>
 
   <dependencies>
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hdfs/DataSet.scala b/gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hdfs/DataSet.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hdfs/DataSet.scala
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hdfs/DataSet.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hdfs/conf/HdfsClientConfiguration.scala b/gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hdfs/conf/HdfsClientConfiguration.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hdfs/conf/HdfsClientConfiguration.scala
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hdfs/conf/HdfsClientConfiguration.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hdfs/conf/HdfsConfigs.scala b/gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hdfs/conf/HdfsConfigs.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hdfs/conf/HdfsConfigs.scala
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hdfs/conf/HdfsConfigs.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hdfs/conf/HdfsConstants.scala b/gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hdfs/conf/HdfsConstants.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hdfs/conf/HdfsConstants.scala
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hdfs/conf/HdfsConstants.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hdfs/utilities/HDFSUtilities.scala b/gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hdfs/utilities/HDFSUtilities.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hdfs/utilities/HDFSUtilities.scala
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hdfs/utilities/HDFSUtilities.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hive/DataSet.scala b/gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hive/DataSet.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hive/DataSet.scala
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hive/DataSet.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hive/conf/HiveConfigs.scala b/gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hive/conf/HiveConfigs.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hive/conf/HiveConfigs.scala
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hive/conf/HiveConfigs.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hive/conf/HiveConstants.scala b/gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hive/conf/HiveConstants.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hive/conf/HiveConstants.scala
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hive/conf/HiveConstants.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hive/utilities/HiveJDBCUtils.scala b/gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hive/utilities/HiveJDBCUtils.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hive/utilities/HiveJDBCUtils.scala
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hive/utilities/HiveJDBCUtils.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hive/utilities/HiveSchemaTemplates.scala b/gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hive/utilities/HiveSchemaTemplates.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hive/utilities/HiveSchemaTemplates.scala
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hive/utilities/HiveSchemaTemplates.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hive/utilities/HiveSchemaUtils.scala b/gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hive/utilities/HiveSchemaUtils.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hive/utilities/HiveSchemaUtils.scala
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hive/utilities/HiveSchemaUtils.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hive/utilities/HiveUtils.scala b/gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hive/utilities/HiveUtils.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/main/scala/com/paypal/gimel/hive/utilities/HiveUtils.scala
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/main/scala/com/paypal/gimel/hive/utilities/HiveUtils.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/resources/hdfs_test.avro b/gimel-dataapi/gimel-connectors/gimel-hive/src/test/resources/hdfs_test.avro
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/resources/hdfs_test.avro
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/test/resources/hdfs_test.avro
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/resources/hdfs_test.csv b/gimel-dataapi/gimel-connectors/gimel-hive/src/test/resources/hdfs_test.csv
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/resources/hdfs_test.csv
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/test/resources/hdfs_test.csv
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/resources/hdfs_test.json b/gimel-dataapi/gimel-connectors/gimel-hive/src/test/resources/hdfs_test.json
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/resources/hdfs_test.json
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/test/resources/hdfs_test.json
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/resources/hdfs_test.parquet b/gimel-dataapi/gimel-connectors/gimel-hive/src/test/resources/hdfs_test.parquet
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/resources/hdfs_test.parquet
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/test/resources/hdfs_test.parquet
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/resources/hdfs_test.seq b/gimel-dataapi/gimel-connectors/gimel-hive/src/test/resources/hdfs_test.seq
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/resources/hdfs_test.seq
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/test/resources/hdfs_test.seq
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/resources/hdfs_test.txt b/gimel-dataapi/gimel-connectors/gimel-hive/src/test/resources/hdfs_test.txt
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/resources/hdfs_test.txt
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/test/resources/hdfs_test.txt
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/resources/hdfs_test.txt.gz b/gimel-dataapi/gimel-connectors/gimel-hive/src/test/resources/hdfs_test.txt.gz
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/resources/hdfs_test.txt.gz
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/test/resources/hdfs_test.txt.gz
diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/scala/com/paypal/gimel/hdfs/DataSetTest.scala b/gimel-dataapi/gimel-connectors/gimel-hive/src/test/scala/com/paypal/gimel/hdfs/DataSetTest.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-hive-1.2/src/test/scala/com/paypal/gimel/hdfs/DataSetTest.scala
rename to gimel-dataapi/gimel-connectors/gimel-hive/src/test/scala/com/paypal/gimel/hdfs/DataSetTest.scala
diff --git a/gimel-dataapi/pom.xml b/gimel-dataapi/pom.xml
index c1f7c61d..bb76ab5e 100644
--- a/gimel-dataapi/pom.xml
+++ b/gimel-dataapi/pom.xml
@@ -39,10 +39,10 @@ under the License.
         <module>gimel-logger</module>
         <module>gimel-common</module>
         <module>gimel-connectors/gimel-sftp</module>
-        <module>gimel-connectors/gimel-elasticsearch-6.2</module>
+        <module>gimel-connectors/gimel-elasticsearch</module>
+        <module>gimel-connectors/gimel-hive</module>
         <module>gimel-connectors/gimel-jdbc</module>
-        <module>gimel-connectors/gimel-hive-1.2</module>
-        <module>gimel-connectors/gimel-hbase-1.2</module>
+        <module>gimel-connectors/gimel-hbase</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>