You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gobblin.apache.org by ab...@apache.org on 2017/07/31 07:52:35 UTC

[17/77] [abbrv] incubator-gobblin git commit: Updated package names, imports and shell scripts

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/retention/HivePartitionVersionRetentionReaperPolicy.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/retention/HivePartitionVersionRetentionReaperPolicy.java b/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/retention/HivePartitionVersionRetentionReaperPolicy.java
index 49df933..fa1131c 100644
--- a/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/retention/HivePartitionVersionRetentionReaperPolicy.java
+++ b/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/retention/HivePartitionVersionRetentionReaperPolicy.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.compliance.retention;
+package org.apache.gobblin.compliance.retention;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -23,11 +23,11 @@ import java.util.concurrent.TimeUnit;
 
 import com.google.common.base.Preconditions;
 
-import gobblin.compliance.ComplianceConfigurationKeys;
-import gobblin.compliance.HivePartitionDataset;
-import gobblin.compliance.HivePartitionVersion;
-import gobblin.compliance.HivePartitionVersionPolicy;
-import gobblin.configuration.State;
+import org.apache.gobblin.compliance.ComplianceConfigurationKeys;
+import org.apache.gobblin.compliance.HivePartitionDataset;
+import org.apache.gobblin.compliance.HivePartitionVersion;
+import org.apache.gobblin.compliance.HivePartitionVersionPolicy;
+import org.apache.gobblin.configuration.State;
 
 
 public class HivePartitionVersionRetentionReaperPolicy extends HivePartitionVersionPolicy {

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/retention/HivePartitionVersionRetentionRunner.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/retention/HivePartitionVersionRetentionRunner.java b/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/retention/HivePartitionVersionRetentionRunner.java
index 5ff1874..868a94a 100644
--- a/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/retention/HivePartitionVersionRetentionRunner.java
+++ b/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/retention/HivePartitionVersionRetentionRunner.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.compliance.retention;
+package org.apache.gobblin.compliance.retention;
 
 import java.util.List;
 
-import gobblin.configuration.State;
-import gobblin.data.management.retention.dataset.CleanableDataset;
-import gobblin.data.management.retention.version.VersionCleaner;
-import gobblin.data.management.version.DatasetVersion;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.data.management.retention.dataset.CleanableDataset;
+import org.apache.gobblin.data.management.retention.version.VersionCleaner;
+import org.apache.gobblin.data.management.version.DatasetVersion;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/DatasetUtils.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/DatasetUtils.java b/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/DatasetUtils.java
index c45304a..2ed08d7 100644
--- a/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/DatasetUtils.java
+++ b/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/DatasetUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.compliance.utils;
+package org.apache.gobblin.compliance.utils;
 
 import java.util.List;
 
@@ -22,7 +22,7 @@ import com.google.common.base.Optional;
 
 import lombok.extern.slf4j.Slf4j;
 
-import gobblin.compliance.HivePartitionDataset;
+import org.apache.gobblin.compliance.HivePartitionDataset;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/PartitionUtils.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/PartitionUtils.java b/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/PartitionUtils.java
index 0003491..37bd2a2 100644
--- a/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/PartitionUtils.java
+++ b/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/PartitionUtils.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.compliance.utils;
+package org.apache.gobblin.compliance.utils;
 
 import java.util.Map;
 
 import com.google.common.base.Preconditions;
 
-import gobblin.compliance.ComplianceConfigurationKeys;
+import org.apache.gobblin.compliance.ComplianceConfigurationKeys;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/ProxyUtils.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/ProxyUtils.java b/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/ProxyUtils.java
index 01bd765..3b4ebc9 100644
--- a/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/ProxyUtils.java
+++ b/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/utils/ProxyUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.compliance.utils;
+package org.apache.gobblin.compliance.utils;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -34,12 +34,12 @@ import com.google.common.base.Preconditions;
 
 import lombok.extern.slf4j.Slf4j;
 
-import gobblin.compliance.ComplianceConfigurationKeys;
-import gobblin.compliance.HiveProxyQueryExecutor;
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.configuration.State;
-import gobblin.util.HostUtils;
-import gobblin.util.WriterUtils;
+import org.apache.gobblin.compliance.ComplianceConfigurationKeys;
+import org.apache.gobblin.compliance.HiveProxyQueryExecutor;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.util.HostUtils;
+import org.apache.gobblin.util.WriterUtils;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/validation/ComplianceValidationJob.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/validation/ComplianceValidationJob.java b/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/validation/ComplianceValidationJob.java
index 4f58dee..7df4fca 100644
--- a/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/validation/ComplianceValidationJob.java
+++ b/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/validation/ComplianceValidationJob.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.compliance.validation;
+package org.apache.gobblin.compliance.validation;
 
 import java.io.IOException;
 import java.util.List;
@@ -36,16 +36,16 @@ import com.google.common.util.concurrent.ListenableFuture;
 import javax.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 
-import gobblin.compliance.ComplianceEvents;
-import gobblin.compliance.ComplianceJob;
-import gobblin.compliance.utils.ProxyUtils;
-import gobblin.configuration.State;
-import gobblin.dataset.Dataset;
-import gobblin.dataset.DatasetsFinder;
-import gobblin.util.ExecutorsUtils;
-import gobblin.util.reflection.GobblinConstructorUtils;
+import org.apache.gobblin.compliance.ComplianceEvents;
+import org.apache.gobblin.compliance.ComplianceJob;
+import org.apache.gobblin.compliance.utils.ProxyUtils;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.dataset.Dataset;
+import org.apache.gobblin.dataset.DatasetsFinder;
+import org.apache.gobblin.util.ExecutorsUtils;
+import org.apache.gobblin.util.reflection.GobblinConstructorUtils;
 
-import static gobblin.compliance.ComplianceConfigurationKeys.GOBBLIN_COMPLIANCE_DATASET_FINDER_CLASS;
+import static org.apache.gobblin.compliance.ComplianceConfigurationKeys.GOBBLIN_COMPLIANCE_DATASET_FINDER_CLASS;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/validation/ValidatableDataset.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/validation/ValidatableDataset.java b/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/validation/ValidatableDataset.java
index 7801186..d86a3fc 100644
--- a/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/validation/ValidatableDataset.java
+++ b/gobblin-modules/gobblin-compliance/src/main/java/org/apache/gobblin/compliance/validation/ValidatableDataset.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.compliance.validation;
+package org.apache.gobblin.compliance.validation;
 
 import java.io.IOException;
 
-import gobblin.dataset.Dataset;
+import org.apache.gobblin.dataset.Dataset;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerConverterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerConverterTest.java b/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerConverterTest.java
index 1a4af67..eeae319 100644
--- a/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerConverterTest.java
+++ b/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerConverterTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.compliance.purger;
+package org.apache.gobblin.compliance.purger;
 
 import org.mockito.Mockito;
 import org.testng.Assert;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.configuration.WorkUnitState;
 
 
 @Test

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerExtractorTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerExtractorTest.java b/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerExtractorTest.java
index 2b3dd5d..884f934 100644
--- a/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerExtractorTest.java
+++ b/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerExtractorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.compliance.purger;
+package org.apache.gobblin.compliance.purger;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerWriterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerWriterTest.java b/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerWriterTest.java
index 94b6983..2af9e86 100644
--- a/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerWriterTest.java
+++ b/gobblin-modules/gobblin-compliance/src/test/java/org/apache/gobblin/compliance/purger/HivePurgerWriterTest.java
@@ -1,4 +1,4 @@
-package gobblin.compliance.purger;
+package org.apache.gobblin.compliance.purger;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/common/TupleDocument.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/common/TupleDocument.java b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/common/TupleDocument.java
index fee1429..519cc4f 100644
--- a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/common/TupleDocument.java
+++ b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/common/TupleDocument.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.couchbase.common;
+package org.apache.gobblin.couchbase.common;
 
 import com.couchbase.client.core.lang.Tuple2;
 import com.couchbase.client.core.message.kv.MutationToken;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/converter/AnyToCouchbaseJsonConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/converter/AnyToCouchbaseJsonConverter.java b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/converter/AnyToCouchbaseJsonConverter.java
index d2bd6bf..6977ac5 100644
--- a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/converter/AnyToCouchbaseJsonConverter.java
+++ b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/converter/AnyToCouchbaseJsonConverter.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package gobblin.couchbase.converter;
+package org.apache.gobblin.couchbase.converter;
 
 import com.couchbase.client.java.document.RawJsonDocument;
 import com.google.common.base.Preconditions;
@@ -27,13 +27,13 @@ import com.google.gson.JsonObject;
 
 import lombok.extern.slf4j.Slf4j;
 
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.configuration.WorkUnitState;
-import gobblin.converter.Converter;
-import gobblin.converter.DataConversionException;
-import gobblin.converter.SchemaConversionException;
-import gobblin.converter.SingleRecordIterable;
-import gobblin.util.ForkOperatorUtils;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.converter.Converter;
+import org.apache.gobblin.converter.DataConversionException;
+import org.apache.gobblin.converter.SchemaConversionException;
+import org.apache.gobblin.converter.SingleRecordIterable;
+import org.apache.gobblin.util.ForkOperatorUtils;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/converter/AvroToCouchbaseTupleConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/converter/AvroToCouchbaseTupleConverter.java b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/converter/AvroToCouchbaseTupleConverter.java
index 93e5909..1a747e3 100644
--- a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/converter/AvroToCouchbaseTupleConverter.java
+++ b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/converter/AvroToCouchbaseTupleConverter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.couchbase.converter;
+package org.apache.gobblin.couchbase.converter;
 
 import java.nio.ByteBuffer;
 
@@ -26,12 +26,12 @@ import com.couchbase.client.core.lang.Tuple;
 import com.couchbase.client.deps.io.netty.buffer.ByteBuf;
 import com.couchbase.client.deps.io.netty.buffer.Unpooled;
 
-import gobblin.configuration.WorkUnitState;
-import gobblin.converter.Converter;
-import gobblin.converter.DataConversionException;
-import gobblin.converter.SchemaConversionException;
-import gobblin.converter.SingleRecordIterable;
-import gobblin.couchbase.common.TupleDocument;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.converter.Converter;
+import org.apache.gobblin.converter.DataConversionException;
+import org.apache.gobblin.converter.SchemaConversionException;
+import org.apache.gobblin.converter.SingleRecordIterable;
+import org.apache.gobblin.couchbase.common.TupleDocument;
 
 
 public class AvroToCouchbaseTupleConverter extends Converter<Schema, String, GenericRecord, TupleDocument> {

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseEnvironmentFactory.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseEnvironmentFactory.java b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseEnvironmentFactory.java
index 703e354..341a5b6 100644
--- a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseEnvironmentFactory.java
+++ b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseEnvironmentFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package gobblin.couchbase.writer;
+package org.apache.gobblin.couchbase.writer;
 
 import com.couchbase.client.java.env.CouchbaseEnvironment;
 import com.couchbase.client.java.env.DefaultCouchbaseEnvironment;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriter.java b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriter.java
index 309bfc9..f7001da 100644
--- a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriter.java
+++ b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.couchbase.writer;
+package org.apache.gobblin.couchbase.writer;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -51,16 +51,16 @@ import lombok.extern.slf4j.Slf4j;
 import rx.Observable;
 import rx.Subscriber;
 
-import gobblin.couchbase.common.TupleDocument;
-import gobblin.util.ConfigUtils;
-import gobblin.writer.AsyncDataWriter;
-import gobblin.writer.GenericWriteResponse;
-import gobblin.writer.GenericWriteResponseWrapper;
-import gobblin.writer.SyncDataWriter;
-import gobblin.writer.WriteCallback;
-import gobblin.writer.WriteResponse;
-import gobblin.writer.WriteResponseFuture;
-import gobblin.writer.WriteResponseMapper;
+import org.apache.gobblin.couchbase.common.TupleDocument;
+import org.apache.gobblin.util.ConfigUtils;
+import org.apache.gobblin.writer.AsyncDataWriter;
+import org.apache.gobblin.writer.GenericWriteResponse;
+import org.apache.gobblin.writer.GenericWriteResponseWrapper;
+import org.apache.gobblin.writer.SyncDataWriter;
+import org.apache.gobblin.writer.WriteCallback;
+import org.apache.gobblin.writer.WriteResponse;
+import org.apache.gobblin.writer.WriteResponseFuture;
+import org.apache.gobblin.writer.WriteResponseMapper;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterBuilder.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterBuilder.java b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterBuilder.java
index c1ccf63..58f1a7a 100644
--- a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterBuilder.java
+++ b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.couchbase.writer;
+package org.apache.gobblin.couchbase.writer;
 
 import java.io.IOException;
 import java.util.Properties;
@@ -23,12 +23,12 @@ import java.util.Properties;
 import com.couchbase.client.java.env.CouchbaseEnvironment;
 import com.typesafe.config.Config;
 
-import gobblin.configuration.State;
-import gobblin.util.ConfigUtils;
-import gobblin.writer.AsyncWriterManager;
-import gobblin.writer.AsyncDataWriter;
-import gobblin.writer.DataWriter;
-import gobblin.writer.DataWriterBuilder;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.util.ConfigUtils;
+import org.apache.gobblin.writer.AsyncWriterManager;
+import org.apache.gobblin.writer.AsyncDataWriter;
+import org.apache.gobblin.writer.DataWriter;
+import org.apache.gobblin.writer.DataWriterBuilder;
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterConfigurationKeys.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterConfigurationKeys.java b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterConfigurationKeys.java
index d369f88..43e69b9 100644
--- a/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterConfigurationKeys.java
+++ b/gobblin-modules/gobblin-couchbase/src/main/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterConfigurationKeys.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.couchbase.writer;
+package org.apache.gobblin.couchbase.writer;
 
 import java.util.Collections;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/CouchbaseTestServer.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/CouchbaseTestServer.java b/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/CouchbaseTestServer.java
index c5ab893..3189a55 100644
--- a/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/CouchbaseTestServer.java
+++ b/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/CouchbaseTestServer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.couchbase;
+package org.apache.gobblin.couchbase;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -41,7 +41,7 @@ import com.google.common.base.Throwables;
 
 import lombok.extern.slf4j.Slf4j;
 
-import gobblin.test.TestUtils;
+import org.apache.gobblin.test.TestUtils;
 
 
 @Slf4j

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/converter/AnyToCouchbaseJsonConverterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/converter/AnyToCouchbaseJsonConverterTest.java b/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/converter/AnyToCouchbaseJsonConverterTest.java
index 056abaf..b237655 100644
--- a/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/converter/AnyToCouchbaseJsonConverterTest.java
+++ b/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/converter/AnyToCouchbaseJsonConverterTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package gobblin.couchbase.converter;
+package org.apache.gobblin.couchbase.converter;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -30,9 +30,9 @@ import com.google.gson.Gson;
 
 import lombok.AllArgsConstructor;
 
-import gobblin.configuration.WorkUnitState;
-import gobblin.converter.Converter;
-import gobblin.converter.DataConversionException;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.converter.Converter;
+import org.apache.gobblin.converter.DataConversionException;
 
 import static org.mockito.Matchers.notNull;
 import static org.mockito.Mockito.mock;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/converter/AvroToCouchbaseTupleConverterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/converter/AvroToCouchbaseTupleConverterTest.java b/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/converter/AvroToCouchbaseTupleConverterTest.java
index 69b328e..d3eb404 100644
--- a/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/converter/AvroToCouchbaseTupleConverterTest.java
+++ b/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/converter/AvroToCouchbaseTupleConverterTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.couchbase.converter;
+package org.apache.gobblin.couchbase.converter;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
@@ -27,8 +27,8 @@ import org.apache.avro.generic.GenericRecord;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import gobblin.converter.Converter;
-import gobblin.couchbase.common.TupleDocument;
+import org.apache.gobblin.converter.Converter;
+import org.apache.gobblin.couchbase.common.TupleDocument;
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterTest.java b/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterTest.java
index 52218b8..c3927de 100644
--- a/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterTest.java
+++ b/gobblin-modules/gobblin-couchbase/src/test/java/org/apache/gobblin/couchbase/writer/CouchbaseWriterTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.couchbase.writer;
+package org.apache.gobblin.couchbase.writer;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -64,18 +64,18 @@ import com.typesafe.config.ConfigFactory;
 
 import lombok.extern.slf4j.Slf4j;
 
-import gobblin.converter.Converter;
-import gobblin.converter.DataConversionException;
-import gobblin.couchbase.CouchbaseTestServer;
-import gobblin.couchbase.common.TupleDocument;
-import gobblin.couchbase.converter.AnyToCouchbaseJsonConverter;
-import gobblin.couchbase.converter.AvroToCouchbaseTupleConverter;
-import gobblin.metrics.RootMetricContext;
-import gobblin.metrics.reporter.OutputStreamReporter;
-import gobblin.test.TestUtils;
-import gobblin.writer.AsyncWriterManager;
-import gobblin.writer.WriteCallback;
-import gobblin.writer.WriteResponse;
+import org.apache.gobblin.converter.Converter;
+import org.apache.gobblin.converter.DataConversionException;
+import org.apache.gobblin.couchbase.CouchbaseTestServer;
+import org.apache.gobblin.couchbase.common.TupleDocument;
+import org.apache.gobblin.couchbase.converter.AnyToCouchbaseJsonConverter;
+import org.apache.gobblin.couchbase.converter.AvroToCouchbaseTupleConverter;
+import org.apache.gobblin.metrics.RootMetricContext;
+import org.apache.gobblin.metrics.reporter.OutputStreamReporter;
+import org.apache.gobblin.test.TestUtils;
+import org.apache.gobblin.writer.AsyncWriterManager;
+import org.apache.gobblin.writer.WriteCallback;
+import org.apache.gobblin.writer.WriteResponse;
 
 @Slf4j
 public class CouchbaseWriterTest {

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/AvroStringFieldEncryptorConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/AvroStringFieldEncryptorConverter.java b/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/AvroStringFieldEncryptorConverter.java
index fdd2de1..0a23d13 100644
--- a/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/AvroStringFieldEncryptorConverter.java
+++ b/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/AvroStringFieldEncryptorConverter.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package gobblin.converter;
+package org.apache.gobblin.converter;
 
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericRecord;
 
-import gobblin.recordaccess.AvroGenericRecordAccessor;
-import gobblin.recordaccess.RecordAccessor;
+import org.apache.gobblin.recordaccess.AvroGenericRecordAccessor;
+import org.apache.gobblin.recordaccess.RecordAccessor;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverter.java b/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverter.java
index b7ab047..d91f72c 100644
--- a/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverter.java
+++ b/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverter.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package gobblin.converter;
+package org.apache.gobblin.converter;
 
 import java.util.Map;
 
-import gobblin.codec.StreamCodec;
-import gobblin.configuration.WorkUnitState;
-import gobblin.crypto.EncryptionConfigParser;
-import gobblin.crypto.EncryptionFactory;
+import org.apache.gobblin.codec.StreamCodec;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.crypto.EncryptionConfigParser;
+import org.apache.gobblin.crypto.EncryptionFactory;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/StringFieldEncryptorConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/StringFieldEncryptorConverter.java b/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/StringFieldEncryptorConverter.java
index 059bc72..4930a7c 100644
--- a/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/StringFieldEncryptorConverter.java
+++ b/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/converter/StringFieldEncryptorConverter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package gobblin.converter;
+package org.apache.gobblin.converter;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -28,11 +28,11 @@ import java.util.Map;
 
 import com.google.common.base.Splitter;
 
-import gobblin.codec.StreamCodec;
-import gobblin.configuration.WorkUnitState;
-import gobblin.crypto.EncryptionConfigParser;
-import gobblin.crypto.EncryptionFactory;
-import gobblin.recordaccess.RecordAccessor;
+import org.apache.gobblin.codec.StreamCodec;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.crypto.EncryptionConfigParser;
+import org.apache.gobblin.crypto.EncryptionFactory;
+import org.apache.gobblin.recordaccess.RecordAccessor;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/crypto/GobblinEncryptionProvider.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/crypto/GobblinEncryptionProvider.java b/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/crypto/GobblinEncryptionProvider.java
index 93e29e9..7d4cd5e 100644
--- a/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/crypto/GobblinEncryptionProvider.java
+++ b/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/crypto/GobblinEncryptionProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import java.io.IOException;
 import java.util.Map;
@@ -23,8 +23,8 @@ import java.util.Set;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 
-import gobblin.annotation.Alpha;
-import gobblin.codec.StreamCodec;
+import org.apache.gobblin.annotation.Alpha;
+import org.apache.gobblin.codec.StreamCodec;
 
 import lombok.extern.slf4j.Slf4j;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStoreCli.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStoreCli.java b/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStoreCli.java
index bdda5bd..06c56b9 100644
--- a/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStoreCli.java
+++ b/gobblin-modules/gobblin-crypto-provider/src/main/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStoreCli.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -46,9 +46,9 @@ import com.google.gson.GsonBuilder;
 import javax.xml.bind.DatatypeConverter;
 import lombok.extern.slf4j.Slf4j;
 
-import gobblin.annotation.Alias;
-import gobblin.crypto.JCEKSKeystoreCredentialStore;
-import gobblin.runtime.cli.CliApplication;
+import org.apache.gobblin.annotation.Alias;
+import org.apache.gobblin.crypto.JCEKSKeystoreCredentialStore;
+import org.apache.gobblin.runtime.cli.CliApplication;
 
 
 @Alias(value = "keystore", description = "Examine JCE Keystore files")

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/converter/AvroStringFieldEncryptorConverterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/converter/AvroStringFieldEncryptorConverterTest.java b/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/converter/AvroStringFieldEncryptorConverterTest.java
index 6dc72ad..c86df54 100644
--- a/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/converter/AvroStringFieldEncryptorConverterTest.java
+++ b/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/converter/AvroStringFieldEncryptorConverterTest.java
@@ -1,4 +1,4 @@
-package gobblin.converter;
+package org.apache.gobblin.converter;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -18,9 +18,9 @@ import org.testng.annotations.Test;
 
 import com.google.common.collect.Maps;
 
-import gobblin.configuration.WorkUnitState;
-import gobblin.test.TestUtils;
-import gobblin.test.crypto.InsecureShiftCodec;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.test.TestUtils;
+import org.apache.gobblin.test.crypto.InsecureShiftCodec;
 
 
 public class AvroStringFieldEncryptorConverterTest {

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverterTest.java b/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverterTest.java
index 38a58f7..ef9a7f5 100644
--- a/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverterTest.java
+++ b/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverterTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.converter;
+package org.apache.gobblin.converter;
 
 import java.util.Iterator;
 
@@ -22,12 +22,12 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.configuration.WorkUnitState;
-import gobblin.crypto.EncryptionConfigParser;
-import gobblin.metadata.types.Metadata;
-import gobblin.test.crypto.InsecureShiftCodec;
-import gobblin.type.RecordWithMetadata;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.crypto.EncryptionConfigParser;
+import org.apache.gobblin.metadata.types.Metadata;
+import org.apache.gobblin.test.crypto.InsecureShiftCodec;
+import org.apache.gobblin.type.RecordWithMetadata;
 
 
 public class SerializedRecordToEncryptedSerializedRecordConverterTest {

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/crypto/GobblinEncryptionProviderTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/crypto/GobblinEncryptionProviderTest.java b/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/crypto/GobblinEncryptionProviderTest.java
index 4fd03bc..fb94914 100644
--- a/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/crypto/GobblinEncryptionProviderTest.java
+++ b/gobblin-modules/gobblin-crypto-provider/src/test/java/org/apache/gobblin/crypto/GobblinEncryptionProviderTest.java
@@ -1,4 +1,4 @@
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -10,7 +10,7 @@ import java.util.Map;
 import org.junit.Assert;
 import org.testng.annotations.Test;
 
-import gobblin.codec.StreamCodec;
+import org.apache.gobblin.codec.StreamCodec;
 
 
 public class GobblinEncryptionProviderTest {

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto-provider/src/test/resources/record_with_arrays.avsc
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto-provider/src/test/resources/record_with_arrays.avsc b/gobblin-modules/gobblin-crypto-provider/src/test/resources/record_with_arrays.avsc
index ba6beb5..b979e0a 100644
--- a/gobblin-modules/gobblin-crypto-provider/src/test/resources/record_with_arrays.avsc
+++ b/gobblin-modules/gobblin-crypto-provider/src/test/resources/record_with_arrays.avsc
@@ -1,7 +1,7 @@
 {
     "name": "NestedTestRecord",
     "type": "record",
-    "namespace": "gobblin.test",
+    "namesapce" : "org.apache.gobblin.test",
     "fields": [
         {
             "name": "fieldToEncrypt",

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto/src/jmh/java/org/apache/gobblin/crypto/EncodingBenchmark.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto/src/jmh/java/org/apache/gobblin/crypto/EncodingBenchmark.java b/gobblin-modules/gobblin-crypto/src/jmh/java/org/apache/gobblin/crypto/EncodingBenchmark.java
index 622d7dd..1421733 100644
--- a/gobblin-modules/gobblin-crypto/src/jmh/java/org/apache/gobblin/crypto/EncodingBenchmark.java
+++ b/gobblin-modules/gobblin-crypto/src/jmh/java/org/apache/gobblin/crypto/EncodingBenchmark.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.ByteArrayOutputStream;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverterBase.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverterBase.java b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverterBase.java
index 7541676..0f0b8ca 100644
--- a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverterBase.java
+++ b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/converter/SerializedRecordToEncryptedSerializedRecordConverterBase.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package gobblin.converter;
+package org.apache.gobblin.converter;
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
@@ -25,9 +25,9 @@ import java.util.Collections;
 
 import lombok.extern.slf4j.Slf4j;
 
-import gobblin.codec.StreamCodec;
-import gobblin.configuration.WorkUnitState;
-import gobblin.type.RecordWithMetadata;
+import org.apache.gobblin.codec.StreamCodec;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.type.RecordWithMetadata;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/Base64KeyToStringCodec.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/Base64KeyToStringCodec.java b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/Base64KeyToStringCodec.java
index 47a127e..7b2995e 100644
--- a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/Base64KeyToStringCodec.java
+++ b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/Base64KeyToStringCodec.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import java.util.Base64;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/GPGCodec.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/GPGCodec.java b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/GPGCodec.java
index fd533a9..e2330e3 100644
--- a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/GPGCodec.java
+++ b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/GPGCodec.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import gobblin.codec.StreamCodec;
+import org.apache.gobblin.codec.StreamCodec;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/GPGFileDecryptor.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/GPGFileDecryptor.java b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/GPGFileDecryptor.java
index d5d7e78..ace76bd 100644
--- a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/GPGFileDecryptor.java
+++ b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/GPGFileDecryptor.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import java.io.IOException;
 import java.io.InputStream;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/HexKeyToStringCodec.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/HexKeyToStringCodec.java b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/HexKeyToStringCodec.java
index c7d9873..a9ae686 100644
--- a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/HexKeyToStringCodec.java
+++ b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/HexKeyToStringCodec.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import javax.xml.bind.DatatypeConverter;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStore.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStore.java b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStore.java
index 1ce3505..db6c042 100644
--- a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStore.java
+++ b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import java.io.IOException;
 import java.io.InputStream;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JsonCredentialStore.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JsonCredentialStore.java b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JsonCredentialStore.java
index 4b86f6f..0d28af1 100644
--- a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JsonCredentialStore.java
+++ b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JsonCredentialStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import java.io.IOException;
 import java.io.InputStream;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/KeyToStringCodec.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/KeyToStringCodec.java b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/KeyToStringCodec.java
index b9945ce..935ab64 100644
--- a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/KeyToStringCodec.java
+++ b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/KeyToStringCodec.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 /**
  * A package that can convert a key to and from a string representation

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/RotatingAESCodec.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/RotatingAESCodec.java b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/RotatingAESCodec.java
index 16f7f00..db8438a 100644
--- a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/RotatingAESCodec.java
+++ b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/RotatingAESCodec.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;
@@ -42,8 +42,8 @@ import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import javax.xml.bind.DatatypeConverter;
 
-import gobblin.codec.Base64Codec;
-import gobblin.codec.StreamCodec;
+import org.apache.gobblin.codec.Base64Codec;
+import org.apache.gobblin.codec.StreamCodec;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStoreTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStoreTest.java b/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStoreTest.java
index 330d0fb..b5be755 100644
--- a/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStoreTest.java
+++ b/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/JCEKSKeystoreCredentialStoreTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import java.io.File;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/JsonCredentialStoreTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/JsonCredentialStoreTest.java b/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/JsonCredentialStoreTest.java
index 501c87a..6fd7882 100644
--- a/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/JsonCredentialStoreTest.java
+++ b/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/JsonCredentialStoreTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import java.io.IOException;
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/KeyToStringCodecTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/KeyToStringCodecTest.java b/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/KeyToStringCodecTest.java
index 14dd61a..0dcad05 100644
--- a/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/KeyToStringCodecTest.java
+++ b/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/KeyToStringCodecTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/RotatingAESCodecTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/RotatingAESCodecTest.java b/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/RotatingAESCodecTest.java
index f81461d..c3ead0f 100644
--- a/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/RotatingAESCodecTest.java
+++ b/gobblin-modules/gobblin-crypto/src/test/java/org/apache/gobblin/crypto/RotatingAESCodecTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.crypto;
+package org.apache.gobblin.crypto;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/EventhubMetricNames.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/EventhubMetricNames.java b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/EventhubMetricNames.java
index 0b48dbc..9671b65 100644
--- a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/EventhubMetricNames.java
+++ b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/EventhubMetricNames.java
@@ -1,4 +1,4 @@
-package gobblin.eventhub;
+package org.apache.gobblin.eventhub;
 
 /**
  * Contains names for all metrics generated by eventhub component
@@ -12,7 +12,7 @@ public class EventhubMetricNames {
      * to be written by a {@link gobblin.eventhub.writer.EventhubDataWriter}. This includes retries.
      */
     public static final String RECORDS_ATTEMPTED_METER = "eventhub.writer.records.attempted";
-  
+
     /**
      * A {@link com.codahale.metrics.Meter} measuring the number records written by a {@link gobblin.eventhub.writer.EventhubDataWriter}
      */
@@ -27,7 +27,7 @@ public class EventhubMetricNames {
      * A {@link com.codahale.metrics.Meter} measuring the number bytes written by a {@link gobblin.eventhub.writer.EventhubDataWriter} as
      */
     public static final String BYTES_WRITTEN_METER = "eventhub.writer.bytes.written";
-  
+
     /**
      * A {@link com.codahale.metrics.Timer} measuring the time taken for each write operation.
      */

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/BatchedEventhubDataWriter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/BatchedEventhubDataWriter.java b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/BatchedEventhubDataWriter.java
index d74f2a5..398a9be 100644
--- a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/BatchedEventhubDataWriter.java
+++ b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/BatchedEventhubDataWriter.java
@@ -1,6 +1,6 @@
-package gobblin.eventhub.writer;
+package org.apache.gobblin.eventhub.writer;
 
-import gobblin.writer.BufferedAsyncDataWriter;
+import org.apache.gobblin.writer.BufferedAsyncDataWriter;
 
 /**
  * A batch writer for eventhub, composed by {@link EventhubBatchAccumulator} and {@link EventhubDataWriter}

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubBatchAccumulator.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubBatchAccumulator.java b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubBatchAccumulator.java
index 03c94fd..19ba87f 100644
--- a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubBatchAccumulator.java
+++ b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubBatchAccumulator.java
@@ -1,6 +1,6 @@
-package gobblin.eventhub.writer;
+package org.apache.gobblin.eventhub.writer;
 
-import gobblin.writer.SequentialBasedBatchAccumulator;
+import org.apache.gobblin.writer.SequentialBasedBatchAccumulator;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriter.java b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriter.java
index 461da39..1a96473 100644
--- a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriter.java
+++ b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriter.java
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package gobblin.eventhub.writer;
+package org.apache.gobblin.eventhub.writer;
 
 import java.io.IOException;
 
-import gobblin.configuration.State;
-import gobblin.eventhub.EventhubMetricNames;
-import gobblin.instrumented.Instrumented;
-import gobblin.metrics.MetricContext;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.eventhub.EventhubMetricNames;
+import org.apache.gobblin.instrumented.Instrumented;
+import org.apache.gobblin.metrics.MetricContext;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -45,14 +45,14 @@ import com.microsoft.azure.servicebus.SharedAccessSignatureTokenProvider;
 
 import lombok.extern.slf4j.Slf4j;
 
-import gobblin.password.PasswordManager;
-import gobblin.writer.Batch;
-import gobblin.writer.BatchAsyncDataWriter;
-import gobblin.writer.SyncDataWriter;
-import gobblin.writer.WriteCallback;
-import gobblin.writer.WriteResponse;
-import gobblin.writer.WriteResponseFuture;
-import gobblin.writer.WriteResponseMapper;
+import org.apache.gobblin.password.PasswordManager;
+import org.apache.gobblin.writer.Batch;
+import org.apache.gobblin.writer.BatchAsyncDataWriter;
+import org.apache.gobblin.writer.SyncDataWriter;
+import org.apache.gobblin.writer.WriteCallback;
+import org.apache.gobblin.writer.WriteResponse;
+import org.apache.gobblin.writer.WriteResponseFuture;
+import org.apache.gobblin.writer.WriteResponseMapper;
 
 import java.time.Duration;
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriterBuilder.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriterBuilder.java b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriterBuilder.java
index b1e6675..46ed1ba 100644
--- a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriterBuilder.java
+++ b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriterBuilder.java
@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package gobblin.eventhub.writer;
+package org.apache.gobblin.eventhub.writer;
 
 import java.io.IOException;
 import java.util.Properties;
 
 import com.typesafe.config.Config;
 
-import gobblin.configuration.State;
-import gobblin.util.ConfigUtils;
-import gobblin.writer.AsyncDataWriter;
-import gobblin.writer.AsyncWriterManager;
-import gobblin.writer.BufferedAsyncDataWriter;
-import gobblin.writer.DataWriter;
-import gobblin.writer.DataWriterBuilder;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.util.ConfigUtils;
+import org.apache.gobblin.writer.AsyncDataWriter;
+import org.apache.gobblin.writer.AsyncWriterManager;
+import org.apache.gobblin.writer.BufferedAsyncDataWriter;
+import org.apache.gobblin.writer.DataWriter;
+import org.apache.gobblin.writer.DataWriterBuilder;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubRequest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubRequest.java b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubRequest.java
index de77d6e..02596a2 100644
--- a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubRequest.java
+++ b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubRequest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package gobblin.eventhub.writer;
+package org.apache.gobblin.eventhub.writer;
 
 
 import org.codehaus.jackson.annotate.JsonProperty;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/BatchedEventhubDataWriterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/BatchedEventhubDataWriterTest.java b/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/BatchedEventhubDataWriterTest.java
index 2a90aad..b37d781 100644
--- a/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/BatchedEventhubDataWriterTest.java
+++ b/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/BatchedEventhubDataWriterTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package gobblin.eventhub.writer;
+package org.apache.gobblin.eventhub.writer;
 
 import java.io.IOException;
 import java.util.LinkedList;
@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.Future;
 
-import gobblin.writer.*;
+import org.apache.gobblin.writer.*;
 import org.apache.http.StatusLine;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubAccumulatorTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubAccumulatorTest.java b/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubAccumulatorTest.java
index 35269fd..639eef2 100644
--- a/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubAccumulatorTest.java
+++ b/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubAccumulatorTest.java
@@ -1,12 +1,12 @@
-package gobblin.eventhub.writer;
+package org.apache.gobblin.eventhub.writer;
 
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 
-import gobblin.writer.SequentialBasedBatchAccumulator;
+import org.apache.gobblin.writer.SequentialBasedBatchAccumulator;
 import org.testng.Assert;
 import org.testng.annotations.Test;
-import gobblin.writer.WriteCallback;
+import org.apache.gobblin.writer.WriteCallback;
 
 
 public class EventhubAccumulatorTest {

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubBatchTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubBatchTest.java b/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubBatchTest.java
index a63659d..fc2d8d8 100644
--- a/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubBatchTest.java
+++ b/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubBatchTest.java
@@ -1,12 +1,12 @@
-package gobblin.eventhub.writer;
+package org.apache.gobblin.eventhub.writer;
 
 import java.io.IOException;
 
-import gobblin.writer.BytesBoundedBatch;
+import org.apache.gobblin.writer.BytesBoundedBatch;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import gobblin.writer.WriteCallback;
+import org.apache.gobblin.writer.WriteCallback;
 
 
 public class EventhubBatchTest {

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubDataWriterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubDataWriterTest.java b/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubDataWriterTest.java
index fbd1855..8bbb069 100644
--- a/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubDataWriterTest.java
+++ b/gobblin-modules/gobblin-eventhub/src/test/java/org/apache/gobblin/eventhub/writer/EventhubDataWriterTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package gobblin.eventhub.writer;
+package org.apache.gobblin.eventhub.writer;
 
 import java.io.IOException;
 import java.util.LinkedList;
@@ -34,9 +34,9 @@ import org.testng.Assert;
 import org.testng.annotations.Test;
 
 
-import gobblin.writer.Batch;
-import gobblin.writer.WriteCallback;
-import gobblin.writer.WriteResponse;
+import org.apache.gobblin.writer.Batch;
+import org.apache.gobblin.writer.WriteCallback;
+import org.apache.gobblin.writer.WriteResponse;
 
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.*;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStore.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStore.java b/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStore.java
index 029c420..59d0e4f 100644
--- a/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStore.java
+++ b/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStore.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -45,8 +45,8 @@ import com.google.common.base.Predicates;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 
-import gobblin.configuration.State;
-import gobblin.util.io.StreamUtils;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.util.io.StreamUtils;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStoreConfigurationKeys.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStoreConfigurationKeys.java b/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStoreConfigurationKeys.java
index d0b4bcd..349aa5a 100644
--- a/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStoreConfigurationKeys.java
+++ b/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStoreConfigurationKeys.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 public class ZkStateStoreConfigurationKeys {
   public static final String STATE_STORE_ZK_CONNECT_STRING_KEY = "state.store.zk.connectString";

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStoreFactory.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStoreFactory.java b/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStoreFactory.java
index e2267a6..2b15efe 100644
--- a/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStoreFactory.java
+++ b/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/metastore/ZkStateStoreFactory.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import com.typesafe.config.Config;
-import gobblin.annotation.Alias;
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.configuration.State;
-import gobblin.util.ConfigUtils;
+import org.apache.gobblin.annotation.Alias;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.util.ConfigUtils;
 import java.util.Properties;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/runtime/ZkDatasetStateStore.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/runtime/ZkDatasetStateStore.java b/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/runtime/ZkDatasetStateStore.java
index 3ac06f0..dbde3fc 100644
--- a/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/runtime/ZkDatasetStateStore.java
+++ b/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/runtime/ZkDatasetStateStore.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package gobblin.runtime;
+package org.apache.gobblin.runtime;
 
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Predicate;
 import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.metastore.DatasetStateStore;
-import gobblin.metastore.ZkStateStore;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.metastore.DatasetStateStore;
+import org.apache.gobblin.metastore.ZkStateStore;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/runtime/ZkDatasetStateStoreFactory.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/runtime/ZkDatasetStateStoreFactory.java b/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/runtime/ZkDatasetStateStoreFactory.java
index 9a79d21..8c30f0b 100644
--- a/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/runtime/ZkDatasetStateStoreFactory.java
+++ b/gobblin-modules/gobblin-helix/src/main/java/org/apache/gobblin/runtime/ZkDatasetStateStoreFactory.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.runtime;
+package org.apache.gobblin.runtime;
 
 import com.typesafe.config.Config;
-import gobblin.annotation.Alias;
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.metastore.DatasetStateStore;
-import gobblin.metastore.ZkStateStoreConfigurationKeys;
-import gobblin.util.ConfigUtils;
+import org.apache.gobblin.annotation.Alias;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.metastore.DatasetStateStore;
+import org.apache.gobblin.metastore.ZkStateStoreConfigurationKeys;
+import org.apache.gobblin.util.ConfigUtils;
 
 @Alias("zk")
 public class ZkDatasetStateStoreFactory implements DatasetStateStore.Factory {

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-helix/src/test/java/org/apache/gobblin/runtime/StateStoreWatermarkStorageTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-helix/src/test/java/org/apache/gobblin/runtime/StateStoreWatermarkStorageTest.java b/gobblin-modules/gobblin-helix/src/test/java/org/apache/gobblin/runtime/StateStoreWatermarkStorageTest.java
index 508c0f1..cae278b 100644
--- a/gobblin-modules/gobblin-helix/src/test/java/org/apache/gobblin/runtime/StateStoreWatermarkStorageTest.java
+++ b/gobblin-modules/gobblin-helix/src/test/java/org/apache/gobblin/runtime/StateStoreWatermarkStorageTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.runtime;
+package org.apache.gobblin.runtime;
 
 import java.io.IOException;
 import java.util.Map;
@@ -29,14 +29,14 @@ import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableList;
 
-import gobblin.config.ConfigBuilder;
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.metastore.DatasetStateStore;
-import gobblin.metastore.StateStore;
-import gobblin.metastore.ZkStateStoreConfigurationKeys;
-import gobblin.source.extractor.CheckpointableWatermark;
-import gobblin.source.extractor.DefaultCheckpointableWatermark;
-import gobblin.source.extractor.extract.LongWatermark;
+import org.apache.gobblin.config.ConfigBuilder;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.metastore.DatasetStateStore;
+import org.apache.gobblin.metastore.StateStore;
+import org.apache.gobblin.metastore.ZkStateStoreConfigurationKeys;
+import org.apache.gobblin.source.extractor.CheckpointableWatermark;
+import org.apache.gobblin.source.extractor.DefaultCheckpointableWatermark;
+import org.apache.gobblin.source.extractor.extract.LongWatermark;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-helix/src/test/java/org/apache/gobblin/runtime/ZkDatasetStateStoreTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-helix/src/test/java/org/apache/gobblin/runtime/ZkDatasetStateStoreTest.java b/gobblin-modules/gobblin-helix/src/test/java/org/apache/gobblin/runtime/ZkDatasetStateStoreTest.java
index 8c64649..742aa98 100644
--- a/gobblin-modules/gobblin-helix/src/test/java/org/apache/gobblin/runtime/ZkDatasetStateStoreTest.java
+++ b/gobblin-modules/gobblin-helix/src/test/java/org/apache/gobblin/runtime/ZkDatasetStateStoreTest.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package gobblin.runtime;
-
-import gobblin.config.ConfigBuilder;
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.configuration.WorkUnitState;
-import gobblin.metastore.DatasetStateStore;
-import gobblin.metastore.StateStore;
-import gobblin.metastore.ZkStateStore;
-import gobblin.metastore.ZkStateStoreConfigurationKeys;
-import gobblin.util.ClassAliasResolver;
+package org.apache.gobblin.runtime;
+
+import org.apache.gobblin.config.ConfigBuilder;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.metastore.DatasetStateStore;
+import org.apache.gobblin.metastore.StateStore;
+import org.apache.gobblin.metastore.ZkStateStore;
+import org.apache.gobblin.metastore.ZkStateStoreConfigurationKeys;
+import org.apache.gobblin.util.ClassAliasResolver;
 import java.io.IOException;
 import java.util.Map;
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-http/src/main/avro/HttpOperation.avsc
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-http/src/main/avro/HttpOperation.avsc b/gobblin-modules/gobblin-http/src/main/avro/HttpOperation.avsc
index 36f19ed..ee51716 100644
--- a/gobblin-modules/gobblin-http/src/main/avro/HttpOperation.avsc
+++ b/gobblin-modules/gobblin-http/src/main/avro/HttpOperation.avsc
@@ -2,7 +2,7 @@
   "type": "record",
   "name": "HttpOperation",
   "doc": "Represents an operation to be performed over http",
-  "namespace": "gobblin.http",
+  "namesapce" : "org.apache.gobblin.http",
   "fields": [
     {
       "name": "keys",

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-http/src/main/avro/HttpRequestReponse.avsc
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-http/src/main/avro/HttpRequestReponse.avsc b/gobblin-modules/gobblin-http/src/main/avro/HttpRequestReponse.avsc
index ad0100d..ae179dc 100644
--- a/gobblin-modules/gobblin-http/src/main/avro/HttpRequestReponse.avsc
+++ b/gobblin-modules/gobblin-http/src/main/avro/HttpRequestReponse.avsc
@@ -2,7 +2,7 @@
   "type": "record",
   "name": "HttpRequestResponseRecord",
   "doc": "Represents an http output record",
-  "namespace": "gobblin.http",
+  "namesapce" : "org.apache.gobblin.http",
   "fields" : [
     {"name": "requestUrl", "type": "string"},
     {"name": "method", "type": "string"},

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AsyncHttpJoinConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AsyncHttpJoinConverter.java b/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AsyncHttpJoinConverter.java
index 77f237d..8c39cda 100644
--- a/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AsyncHttpJoinConverter.java
+++ b/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AsyncHttpJoinConverter.java
@@ -1,4 +1,4 @@
-package gobblin.converter;
+package org.apache.gobblin.converter;
 
 import java.io.IOException;
 import java.util.Queue;
@@ -14,23 +14,23 @@ import com.typesafe.config.ConfigFactory;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
-import gobblin.async.AsyncRequest;
-import gobblin.async.AsyncRequestBuilder;
-import gobblin.async.BufferedRecord;
-import gobblin.async.Callback;
-import gobblin.broker.gobblin_scopes.GobblinScopeTypes;
-import gobblin.broker.iface.SharedResourcesBroker;
-import gobblin.config.ConfigBuilder;
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.configuration.State;
-import gobblin.configuration.WorkUnitState;
-import gobblin.http.HttpClient;
-import gobblin.http.HttpOperation;
-import gobblin.http.ResponseHandler;
-import gobblin.http.ResponseStatus;
-import gobblin.net.Request;
-import gobblin.utils.HttpConstants;
-import gobblin.writer.WriteCallback;
+import org.apache.gobblin.async.AsyncRequest;
+import org.apache.gobblin.async.AsyncRequestBuilder;
+import org.apache.gobblin.async.BufferedRecord;
+import org.apache.gobblin.async.Callback;
+import org.apache.gobblin.broker.gobblin_scopes.GobblinScopeTypes;
+import org.apache.gobblin.broker.iface.SharedResourcesBroker;
+import org.apache.gobblin.config.ConfigBuilder;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.http.HttpClient;
+import org.apache.gobblin.http.HttpOperation;
+import org.apache.gobblin.http.ResponseHandler;
+import org.apache.gobblin.http.ResponseStatus;
+import org.apache.gobblin.net.Request;
+import org.apache.gobblin.utils.HttpConstants;
+import org.apache.gobblin.writer.WriteCallback;
 import edu.umd.cs.findbugs.annotations.SuppressWarnings;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroApacheHttpJoinConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroApacheHttpJoinConverter.java b/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroApacheHttpJoinConverter.java
index 4a17947..6e7ec4f 100644
--- a/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroApacheHttpJoinConverter.java
+++ b/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroApacheHttpJoinConverter.java
@@ -1,4 +1,4 @@
-package gobblin.converter;
+package org.apache.gobblin.converter;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -12,15 +12,15 @@ import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
 import com.typesafe.config.Config;
 import lombok.extern.slf4j.Slf4j;
 
-import gobblin.broker.gobblin_scopes.GobblinScopeTypes;
-import gobblin.broker.iface.SharedResourcesBroker;
-import gobblin.http.ApacheHttpAsyncClient;
-import gobblin.http.ApacheHttpResponseHandler;
-import gobblin.http.ApacheHttpResponseStatus;
-import gobblin.http.ApacheHttpRequestBuilder;
-import gobblin.http.HttpRequestResponseRecord;
-import gobblin.http.ResponseStatus;
-import gobblin.utils.HttpConstants;
+import org.apache.gobblin.broker.gobblin_scopes.GobblinScopeTypes;
+import org.apache.gobblin.broker.iface.SharedResourcesBroker;
+import org.apache.gobblin.http.ApacheHttpAsyncClient;
+import org.apache.gobblin.http.ApacheHttpResponseHandler;
+import org.apache.gobblin.http.ApacheHttpResponseStatus;
+import org.apache.gobblin.http.ApacheHttpRequestBuilder;
+import org.apache.gobblin.http.HttpRequestResponseRecord;
+import org.apache.gobblin.http.ResponseStatus;
+import org.apache.gobblin.utils.HttpConstants;
 
 /**
  * Apache version of http join converter

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroHttpJoinConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroHttpJoinConverter.java b/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroHttpJoinConverter.java
index f3237a8..b619bed 100644
--- a/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroHttpJoinConverter.java
+++ b/gobblin-modules/gobblin-http/src/main/java/org/apache/gobblin/converter/AvroHttpJoinConverter.java
@@ -1,4 +1,4 @@
-package gobblin.converter;
+package org.apache.gobblin.converter;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -13,12 +13,12 @@ import org.apache.avro.generic.GenericRecord;
 import com.google.common.collect.Lists;
 
 import lombok.extern.slf4j.Slf4j;
-import gobblin.configuration.State;
-import gobblin.configuration.WorkUnitState;
-import gobblin.http.HttpOperation;
-import gobblin.http.HttpRequestResponseRecord;
-import gobblin.http.ResponseStatus;
-import gobblin.utils.HttpUtils;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.http.HttpOperation;
+import org.apache.gobblin.http.HttpRequestResponseRecord;
+import org.apache.gobblin.http.ResponseStatus;
+import org.apache.gobblin.utils.HttpUtils;
 
 
 /**