Move internal & common & trace to the new package io.opencensus (#339)

147 files changed, 380 insertions, 513 deletions

diff --git a/README.md b/README.md
index dd7fb57e..965c98fe 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-Instrumentation - A stats collection framework
-======================================================
+OpenCensus - A stats collection and distributed tracing framework
+=================================================================
 [![Build Status](https://travis-ci.org/census-instrumentation/instrumentation-java.svg?branch=master)](https://travis-ci.org/census-instrumentation/instrumentation-java) [![Build status](https://ci.appveyor.com/api/projects/status/v5dbthkucuewsu33/branch/master?svg=true)](https://ci.appveyor.com/project/instrumentationjavateam/instrumentation-java/branch/master)
 
-Instrumentation provides a framework to define and collect stats against metrics and to
-break those stats down across user-defined dimensions.  The library is in alpha
+OpenCensus provides a framework to define and collect stats against metrics and to
+break those stats down across user-defined dimensions. The library is in alpha
 stage and the API is subject to change.
diff --git a/all/build.gradle b/all/build.gradle
index e1acc774..33189277 100644
--- a/all/build.gradle
+++ b/all/build.gradle
@@ -14,9 +14,10 @@ buildscript {
 // TODO(bdrutu): core_impl_android subproject currently isn't included because Javadoc cannot
 // handle multiple classes with the same name, such as StatsManagerImpl.
 def subprojects = [
-  project(':core'),
-  project(':core_impl'),
-  project(':core_impl_java'),
+        project(':opencensus-api'),
+        project(':core'),
+        project(':core_impl'),
+        project(':core_impl_java'),
 ]
 
 for (subproject in rootProject.subprojects) {
@@ -49,7 +50,7 @@ task jacocoMerge(type: JacocoMerge) {
     mustRunAfter(subprojects.jacocoTestReport.mustRunAfter)
     destinationFile = file("${buildDir}/jacoco/test.exec")
     executionData = files(subprojects.jacocoTestReport.executionData)
-        .filter { f -> f.exists() }
+            .filter { f -> f.exists() }
 }
 
 jacocoTestReport {
diff --git a/api/README.md b/api/README.md
new file mode 100644
index 00000000..797ebe0a
--- /dev/null
+++ b/api/README.md
@@ -0,0 +1,6 @@
+OpenCensus API
+======================================================
+
+* Java 6 and Android compatible.
+* The abstract classes in this directory can be subclassed to create alternative
+  implementations of the Instrumentation library.
diff --git a/api/build.gradle b/api/build.gradle
new file mode 100644
index 00000000..7cfb33b2
--- /dev/null
+++ b/api/build.gradle
@@ -0,0 +1,11 @@
+description = 'OpenCensus: API'
+
+dependencies {
+    compile libraries.grpc_context,
+            libraries.guava
+    compileOnly libraries.auto_value
+
+    signature "org.codehaus.mojo.signature:java16:+@signature"
+}
+
+javadoc.exclude 'io/opencensus/**'
\ No newline at end of file
diff --git a/core/src/main/java/com/google/instrumentation/common/Clock.java b/api/src/main/java/io/opencensus/common/Clock.java
index c57a964c..420c5191 100644
--- a/core/src/main/java/com/google/instrumentation/common/Clock.java
+++ b/api/src/main/java/io/opencensus/common/Clock.java
@@ -11,11 +11,9 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.common;
+package io.opencensus.common;
 
-/**
- * Interface for getting the current time.
- */
+/** Interface for getting the current time. */
 public abstract class Clock {
 
   /**
diff --git a/core/src/main/java/com/google/instrumentation/common/Duration.java b/api/src/main/java/io/opencensus/common/Duration.java
index 657575da..c0e9f1bc 100644
--- a/core/src/main/java/com/google/instrumentation/common/Duration.java
+++ b/api/src/main/java/io/opencensus/common/Duration.java
@@ -11,27 +11,24 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.common;
+package io.opencensus.common;
 
 /**
- * Represents a signed, fixed-length span of time represented as a count of seconds and fractions
- * of seconds at nanosecond resolution. It is independent of any calendar and concepts like "day"
- * or "month". Range is approximately +-10,000 years.
+ * Represents a signed, fixed-length span of time represented as a count of seconds and fractions of
+ * seconds at nanosecond resolution. It is independent of any calendar and concepts like "day" or
+ * "month". Range is approximately +-10,000 years.
  */
 public class Duration {
   /**
    * Creates a new time duration from given seconds and nanoseconds.
    *
-   * @param seconds Signed seconds of the span of time. Must be from -315,576,000,000
-   *     to +315,576,000,000 inclusive.
-   *
-   * @param nanos Signed fractions of a second at nanosecond resolution of the span
-   *     of time. Durations less than one second are represented with a 0
-   *     `seconds` field and a positive or negative `nanos` field. For durations
-   *     of one second or more, a non-zero value for the `nanos` field must be
-   *     of the same sign as the `seconds` field. Must be from -999,999,999
-   *     to +999,999,999 inclusive.
-   *
+   * @param seconds Signed seconds of the span of time. Must be from -315,576,000,000 to
+   *     +315,576,000,000 inclusive.
+   * @param nanos Signed fractions of a second at nanosecond resolution of the span of time.
+   *     Durations less than one second are represented with a 0 `seconds` field and a positive or
+   *     negative `nanos` field. For durations of one second or more, a non-zero value for the
+   *     `nanos` field must be of the same sign as the `seconds` field. Must be from -999,999,999 to
+   *     +999,999,999 inclusive.
    * @return new {@link Duration} with specified fields. For invalid inputs, a {@link Duration} of
    *     zero is returned.
    */
@@ -48,25 +45,19 @@ public class Duration {
     return new Duration(seconds, nanos);
   }
 
-  /**
-   * Creates a new {@link Duration} from given milliseconds.
-   */
+  /** Creates a new {@link Duration} from given milliseconds. */
   public static Duration fromMillis(long millis) {
     long seconds = millis / NUM_MILLIS_PER_SECOND;
     int nanos = (int) (millis % NUM_MILLIS_PER_SECOND) * NUM_NANOS_PER_MILLI;
     return new Duration(seconds, nanos);
   }
 
-  /**
-   * Returns the number of seconds in the {@link Duration}.
-   */
+  /** Returns the number of seconds in the {@link Duration}. */
   public long getSeconds() {
     return seconds;
   }
 
-  /**
-   * Returns the number of nanoseconds in the {@link Duration}.
-   */
+  /** Returns the number of nanoseconds in the {@link Duration}. */
   public int getNanos() {
     return nanos;
   }
diff --git a/core/src/main/java/com/google/instrumentation/common/Function.java b/api/src/main/java/io/opencensus/common/Function.java
index 16471a55..51bf845c 100644
--- a/core/src/main/java/com/google/instrumentation/common/Function.java
+++ b/api/src/main/java/io/opencensus/common/Function.java
@@ -11,14 +11,14 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.common;
+package io.opencensus.common;
 
 /**
  * Used to specify matching functions for use encoding tagged unions (i.e. sum types) in Java. See
- * {@link com.google.instrumentation.stats.ViewDescriptor} for an example of it's use.
+ * {@link io.opencensus.stats.ViewDescriptor} for an example of it's use.
  *
- * <p>Note: This class is based on the java.util.Function class added in Java 1.8.  We cannot use
- * the Function from Java 1.8 because this library is Java 1.6 compatible.
+ * <p>Note: This class is based on the java.util.Function class added in Java 1.8. We cannot use the
+ * Function from Java 1.8 because this library is Java 1.6 compatible.
  */
 public interface Function<A, B> {
   B apply(A arg);
diff --git a/core/src/main/java/com/google/instrumentation/common/Internal.java b/api/src/main/java/io/opencensus/common/Internal.java
index 448c5235..9d540e21 100644
--- a/core/src/main/java/com/google/instrumentation/common/Internal.java
+++ b/api/src/main/java/io/opencensus/common/Internal.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.common;
+package io.opencensus.common;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -26,12 +26,12 @@ import java.lang.annotation.Target;
 @Internal
 @Retention(RetentionPolicy.SOURCE)
 @Target({
-    ElementType.ANNOTATION_TYPE,
-    ElementType.CONSTRUCTOR,
-    ElementType.FIELD,
-    ElementType.METHOD,
-    ElementType.PACKAGE,
-    ElementType.TYPE})
+  ElementType.ANNOTATION_TYPE,
+  ElementType.CONSTRUCTOR,
+  ElementType.FIELD,
+  ElementType.METHOD,
+  ElementType.PACKAGE,
+  ElementType.TYPE
+})
 @Documented
-public @interface Internal {
-}
+public @interface Internal {}
diff --git a/core/src/main/java/com/google/instrumentation/common/NonThrowingCloseable.java b/api/src/main/java/io/opencensus/common/NonThrowingCloseable.java
index d00572bc..1dac89f8 100644
--- a/core/src/main/java/com/google/instrumentation/common/NonThrowingCloseable.java
+++ b/api/src/main/java/io/opencensus/common/NonThrowingCloseable.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.common;
+package io.opencensus.common;
 
 import java.io.Closeable;
 
diff --git a/core/src/main/java/com/google/instrumentation/common/Timestamp.java b/api/src/main/java/io/opencensus/common/Timestamp.java
index 143f9766..34c4c851 100644
--- a/core/src/main/java/com/google/instrumentation/common/Timestamp.java
+++ b/api/src/main/java/io/opencensus/common/Timestamp.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.common;
+package io.opencensus.common;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -42,13 +42,13 @@ public final class Timestamp {
   /**
    * Creates a new timestamp from given seconds and nanoseconds.
    *
-   * @param seconds Represents seconds of UTC time since Unix epoch 1970-01-01T00:00:00Z. Must
-   *     be from from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive.
-   * @param nanos Non-negative fractions of a second at nanosecond resolution. Negative
-   *     second values with fractions must still have non-negative nanos values that count forward
-   *     in time. Must be from 0 to 999,999,999 inclusive.
-   * @return new {@link Timestamp} with specified fields. For invalid inputs, a {@link Timestamp}
-   *     of zero is returned.
+   * @param seconds Represents seconds of UTC time since Unix epoch 1970-01-01T00:00:00Z. Must be
+   *     from from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive.
+   * @param nanos Non-negative fractions of a second at nanosecond resolution. Negative second
+   *     values with fractions must still have non-negative nanos values that count forward in time.
+   *     Must be from 0 to 999,999,999 inclusive.
+   * @return new {@link Timestamp} with specified fields. For invalid inputs, a {@link Timestamp} of
+   *     zero is returned.
    */
   public static Timestamp create(long seconds, int nanos) {
     if (seconds < -MAX_SECONDS || seconds > MAX_SECONDS) {
diff --git a/core/src/main/java/com/google/instrumentation/internal/Provider.java b/api/src/main/java/io/opencensus/internal/Provider.java
index e98ea347..148b6c38 100644
--- a/core/src/main/java/com/google/instrumentation/internal/Provider.java
+++ b/api/src/main/java/io/opencensus/internal/Provider.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.internal;
+package io.opencensus.internal;
 
 import java.util.ServiceConfigurationError;
 import java.util.logging.Level;
diff --git a/core/src/main/java/com/google/instrumentation/internal/StringUtil.java b/api/src/main/java/io/opencensus/internal/StringUtil.java
index 201d3066..48992ebd 100644
--- a/core/src/main/java/com/google/instrumentation/internal/StringUtil.java
+++ b/api/src/main/java/io/opencensus/internal/StringUtil.java
@@ -11,11 +11,9 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.internal;
+package io.opencensus.internal;
 
-/**
- * Internal utility methods for working with tag keys, tag values, and metric names.
- */
+/** Internal utility methods for working with tag keys, tag values, and metric names. */
 public final class StringUtil {
 
   public static final int MAX_LENGTH = 255;
diff --git a/core/src/main/java/com/google/instrumentation/internal/TestClock.java b/api/src/main/java/io/opencensus/internal/TestClock.java
index 7cf922d1..d181da3a 100644
--- a/core/src/main/java/com/google/instrumentation/internal/TestClock.java
+++ b/api/src/main/java/io/opencensus/internal/TestClock.java
@@ -11,18 +11,16 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.internal;
+package io.opencensus.internal;
 
 import com.google.common.math.LongMath;
-import com.google.instrumentation.common.Clock;
-import com.google.instrumentation.common.Duration;
-import com.google.instrumentation.common.Timestamp;
+import io.opencensus.common.Clock;
+import io.opencensus.common.Duration;
+import io.opencensus.common.Timestamp;
 import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.ThreadSafe;
 
-/**
- * A {@link Clock} that allows the time to be set for testing.
- */
+/** A {@link Clock} that allows the time to be set for testing. */
 @ThreadSafe
 public final class TestClock extends Clock {
   private static final int NUM_NANOS_PER_SECOND = 1000 * 1000 * 1000;
diff --git a/core/src/main/java/com/google/instrumentation/internal/ZeroTimeClock.java b/api/src/main/java/io/opencensus/internal/ZeroTimeClock.java
index 1d53a1e7..022f02fe 100644
--- a/core/src/main/java/com/google/instrumentation/internal/ZeroTimeClock.java
+++ b/api/src/main/java/io/opencensus/internal/ZeroTimeClock.java
@@ -11,15 +11,13 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.internal;
+package io.opencensus.internal;
 
-import com.google.instrumentation.common.Clock;
-import com.google.instrumentation.common.Timestamp;
+import io.opencensus.common.Clock;
+import io.opencensus.common.Timestamp;
 import javax.annotation.concurrent.Immutable;
 
-/**
- * A {@link Clock} that always returns 0.
- */
+/** A {@link Clock} that always returns 0. */
 @Immutable
 public final class ZeroTimeClock extends Clock {
   private static final ZeroTimeClock INSTANCE = new ZeroTimeClock();
diff --git a/core_impl/src/main/java/com/google/instrumentation/internal/package-info.java b/api/src/main/java/io/opencensus/internal/package-info.java
index 84939705..5fe0010d 100644
--- a/core_impl/src/main/java/com/google/instrumentation/internal/package-info.java
+++ b/api/src/main/java/io/opencensus/internal/package-info.java
@@ -15,7 +15,7 @@
  * Interfaces and implementations that are internal to opencensus.
  *
  * <p>All the content under this package and its subpackages are considered annotated with {@link
- * com.google.instrumentation.common.Internal}.
+ * io.opencensus.common.Internal}.
  */
-@com.google.instrumentation.common.Internal
-package com.google.instrumentation.internal;
+@io.opencensus.common.Internal
+package io.opencensus.internal;
diff --git a/core/src/main/java/io/opencensus/tags/TagKey.java b/api/src/main/java/io/opencensus/tags/TagKey.java
index 5775eae7..970ee925 100644
--- a/core/src/main/java/io/opencensus/tags/TagKey.java
+++ b/api/src/main/java/io/opencensus/tags/TagKey.java
@@ -19,7 +19,7 @@ import static io.opencensus.tags.TagKey.TagType.TAG_LONG;
 import static io.opencensus.tags.TagKey.TagType.TAG_STRING;
 
 import com.google.auto.value.AutoValue;
-import com.google.instrumentation.internal.StringUtil;
+import io.opencensus.internal.StringUtil;
 import javax.annotation.concurrent.Immutable;
 
 /**
@@ -48,8 +48,8 @@ public abstract class TagKey<TagValueT> {
    * <p>The name must meet the following requirements:
    *
    * <ol>
-   *   <li>It cannot be longer than {@link #MAX_LENGTH}.
-   *   <li>It can only contain printable ASCII characters.
+   * <li>It cannot be longer than {@link #MAX_LENGTH}.
+   * <li>It can only contain printable ASCII characters.
    * </ol>
    *
    * @param name the name of the key.
@@ -66,8 +66,8 @@ public abstract class TagKey<TagValueT> {
    * <p>The name must meet the following requirements:
    *
    * <ol>
-   *   <li>It cannot be longer than {@link #MAX_LENGTH}.
-   *   <li>It can only contain printable ASCII characters.
+   * <li>It cannot be longer than {@link #MAX_LENGTH}.
+   * <li>It can only contain printable ASCII characters.
    * </ol>
    *
    * @param name the name of the key.
@@ -85,8 +85,8 @@ public abstract class TagKey<TagValueT> {
    * <p>The name must meet the following requirements:
    *
    * <ol>
-   *   <li>It cannot be longer than {@link #MAX_LENGTH}.
-   *   <li>It can only contain printable ASCII characters.
+   * <li>It cannot be longer than {@link #MAX_LENGTH}.
+   * <li>It can only contain printable ASCII characters.
    * </ol>
    *
    * @param name the name of the key.
diff --git a/core/src/main/java/io/opencensus/tags/TagMap.java b/api/src/main/java/io/opencensus/tags/TagMap.java
index 2b64880b..8edbda0d 100644
--- a/core/src/main/java/io/opencensus/tags/TagMap.java
+++ b/api/src/main/java/io/opencensus/tags/TagMap.java
@@ -15,7 +15,7 @@ package io.opencensus.tags;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import com.google.instrumentation.internal.StringUtil;
+import io.opencensus.internal.StringUtil;
 import io.opencensus.tags.TagKey.TagType;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/core/src/main/java/com/google/instrumentation/trace/Annotation.java b/api/src/main/java/io/opencensus/trace/Annotation.java
index cfd0e27f..f72070e8 100644
--- a/core/src/main/java/com/google/instrumentation/trace/Annotation.java
+++ b/api/src/main/java/io/opencensus/trace/Annotation.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/core/src/main/java/com/google/instrumentation/trace/AttributeValue.java b/api/src/main/java/io/opencensus/trace/AttributeValue.java
index 09b749cd..f66fd425 100644
--- a/core/src/main/java/com/google/instrumentation/trace/AttributeValue.java
+++ b/api/src/main/java/io/opencensus/trace/AttributeValue.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/core/src/main/java/com/google/instrumentation/trace/BinaryPropagationHandler.java b/api/src/main/java/io/opencensus/trace/BinaryPropagationHandler.java
index 7ef9900b..bc86dd7f 100644
--- a/core/src/main/java/com/google/instrumentation/trace/BinaryPropagationHandler.java
+++ b/api/src/main/java/io/opencensus/trace/BinaryPropagationHandler.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/core/src/main/java/com/google/instrumentation/trace/BlankSpan.java b/api/src/main/java/io/opencensus/trace/BlankSpan.java
index e4a195fe..40e49551 100644
--- a/core/src/main/java/com/google/instrumentation/trace/BlankSpan.java
+++ b/api/src/main/java/io/opencensus/trace/BlankSpan.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import java.util.Map;
 import javax.annotation.concurrent.Immutable;
diff --git a/core/src/main/java/com/google/instrumentation/trace/ContextUtils.java b/api/src/main/java/io/opencensus/trace/ContextUtils.java
index bab9c189..c5331563 100644
--- a/core/src/main/java/com/google/instrumentation/trace/ContextUtils.java
+++ b/api/src/main/java/io/opencensus/trace/ContextUtils.java
@@ -11,10 +11,10 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
 import io.grpc.Context;
+import io.opencensus.common.NonThrowingCloseable;
 
 /**
  * Util methods/functionality to interact with the {@link io.grpc.Context}.
diff --git a/core/src/main/java/com/google/instrumentation/trace/EndSpanOptions.java b/api/src/main/java/io/opencensus/trace/EndSpanOptions.java
index 25f6e7c6..e58a06c3 100644
--- a/core/src/main/java/com/google/instrumentation/trace/EndSpanOptions.java
+++ b/api/src/main/java/io/opencensus/trace/EndSpanOptions.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/core/src/main/java/com/google/instrumentation/trace/Link.java b/api/src/main/java/io/opencensus/trace/Link.java
index 2934a083..d582b68b 100644
--- a/core/src/main/java/com/google/instrumentation/trace/Link.java
+++ b/api/src/main/java/io/opencensus/trace/Link.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import com.google.auto.value.AutoValue;
 import javax.annotation.concurrent.Immutable;
diff --git a/core/src/main/java/com/google/instrumentation/trace/NetworkEvent.java b/api/src/main/java/io/opencensus/trace/NetworkEvent.java
index 19730a18..10687074 100644
--- a/core/src/main/java/com/google/instrumentation/trace/NetworkEvent.java
+++ b/api/src/main/java/io/opencensus/trace/NetworkEvent.java
@@ -11,12 +11,12 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.auto.value.AutoValue;
-import com.google.instrumentation.common.Timestamp;
+import io.opencensus.common.Timestamp;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
diff --git a/core/src/main/java/com/google/instrumentation/trace/Sampler.java b/api/src/main/java/io/opencensus/trace/Sampler.java
index eec1cbd7..e5014fa4 100644
--- a/core/src/main/java/com/google/instrumentation/trace/Sampler.java
+++ b/api/src/main/java/io/opencensus/trace/Sampler.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import java.util.List;
 import javax.annotation.Nullable;
diff --git a/core/src/main/java/com/google/instrumentation/trace/Samplers.java b/api/src/main/java/io/opencensus/trace/Samplers.java
index 59b637f5..33c2a006 100644
--- a/core/src/main/java/com/google/instrumentation/trace/Samplers.java
+++ b/api/src/main/java/io/opencensus/trace/Samplers.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
diff --git a/core/src/main/java/com/google/instrumentation/trace/ScopedSpanHandle.java b/api/src/main/java/io/opencensus/trace/ScopedSpanHandle.java
index 2838071b..965c4d98 100644
--- a/core/src/main/java/com/google/instrumentation/trace/ScopedSpanHandle.java
+++ b/api/src/main/java/io/opencensus/trace/ScopedSpanHandle.java
@@ -11,9 +11,9 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
+import io.opencensus.common.NonThrowingCloseable;
 
 /**
  * Defines a scope of code where the given {@link Span} is in the current context. The scope is
diff --git a/core/src/main/java/com/google/instrumentation/trace/Span.java b/api/src/main/java/io/opencensus/trace/Span.java
index 6305c80a..76dcd9c7 100644
--- a/core/src/main/java/com/google/instrumentation/trace/Span.java
+++ b/api/src/main/java/io/opencensus/trace/Span.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/core/src/main/java/com/google/instrumentation/trace/SpanBuilder.java b/api/src/main/java/io/opencensus/trace/SpanBuilder.java
index 601b9310..4b988dfc 100644
--- a/core/src/main/java/com/google/instrumentation/trace/SpanBuilder.java
+++ b/api/src/main/java/io/opencensus/trace/SpanBuilder.java
@@ -11,9 +11,9 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
+import io.opencensus.common.NonThrowingCloseable;
 import java.util.List;
 import javax.annotation.Nullable;
 
diff --git a/core/src/main/java/com/google/instrumentation/trace/SpanContext.java b/api/src/main/java/io/opencensus/trace/SpanContext.java
index 4cec748b..4902f15f 100644
--- a/core/src/main/java/com/google/instrumentation/trace/SpanContext.java
+++ b/api/src/main/java/io/opencensus/trace/SpanContext.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
diff --git a/core/src/main/java/com/google/instrumentation/trace/SpanData.java b/api/src/main/java/io/opencensus/trace/SpanData.java
index 8435709c..f9a8140f 100644
--- a/core/src/main/java/com/google/instrumentation/trace/SpanData.java
+++ b/api/src/main/java/io/opencensus/trace/SpanData.java
@@ -11,12 +11,12 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.auto.value.AutoValue;
-import com.google.instrumentation.common.Timestamp;
+import io.opencensus.common.Timestamp;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/core/src/main/java/com/google/instrumentation/trace/SpanFactory.java b/api/src/main/java/io/opencensus/trace/SpanFactory.java
index 57c59c39..aca5bd85 100644
--- a/core/src/main/java/com/google/instrumentation/trace/SpanFactory.java
+++ b/api/src/main/java/io/opencensus/trace/SpanFactory.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import javax.annotation.Nullable;
 
diff --git a/core/src/main/java/com/google/instrumentation/trace/SpanId.java b/api/src/main/java/io/opencensus/trace/SpanId.java
index 400ffdc3..8128c9d7 100644
--- a/core/src/main/java/com/google/instrumentation/trace/SpanId.java
+++ b/api/src/main/java/io/opencensus/trace/SpanId.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/core/src/main/java/com/google/instrumentation/trace/StartSpanOptions.java b/api/src/main/java/io/opencensus/trace/StartSpanOptions.java
index 18d9e691..01bc8885 100644
--- a/core/src/main/java/com/google/instrumentation/trace/StartSpanOptions.java
+++ b/api/src/main/java/io/opencensus/trace/StartSpanOptions.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import com.google.common.base.Objects;
 import java.util.Collections;
diff --git a/core/src/main/java/com/google/instrumentation/trace/Status.java b/api/src/main/java/io/opencensus/trace/Status.java
index 2c72a856..22cb5287 100644
--- a/core/src/main/java/com/google/instrumentation/trace/Status.java
+++ b/api/src/main/java/io/opencensus/trace/Status.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/core/src/main/java/com/google/instrumentation/trace/TraceComponent.java b/api/src/main/java/io/opencensus/trace/TraceComponent.java
index 885f0dea..1829417f 100644
--- a/core/src/main/java/com/google/instrumentation/trace/TraceComponent.java
+++ b/api/src/main/java/io/opencensus/trace/TraceComponent.java
@@ -11,10 +11,10 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
-import com.google.instrumentation.common.Clock;
-import com.google.instrumentation.internal.ZeroTimeClock;
+import io.opencensus.common.Clock;
+import io.opencensus.internal.ZeroTimeClock;
 
 /**
  * Class that holds the implementation instances for {@link Tracer}, {@link
diff --git a/core/src/main/java/com/google/instrumentation/trace/TraceConfig.java b/api/src/main/java/io/opencensus/trace/TraceConfig.java
index de3177b1..41fa75b8 100644
--- a/core/src/main/java/com/google/instrumentation/trace/TraceConfig.java
+++ b/api/src/main/java/io/opencensus/trace/TraceConfig.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/core/src/main/java/com/google/instrumentation/trace/TraceExporter.java b/api/src/main/java/io/opencensus/trace/TraceExporter.java
index d610ca7e..7da2d604 100644
--- a/core/src/main/java/com/google/instrumentation/trace/TraceExporter.java
+++ b/api/src/main/java/io/opencensus/trace/TraceExporter.java
@@ -11,13 +11,13 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.auto.value.AutoValue;
-import com.google.instrumentation.trace.Status.CanonicalCode;
+import io.opencensus.trace.Status.CanonicalCode;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -550,7 +550,7 @@ public abstract class TraceExporter {
    * <pre>{@code
    * public static void main(String[] args) {
    *   Tracing.getTraceExporter().registerServiceHandler(
-   *       "com.google.instrumentation.LoggingServiceHandler", LoggingServiceHandler.getInstance());
+   *       "io.opencensus.LoggingServiceHandler", LoggingServiceHandler.getInstance());
    *   // ...
    * }
    * }</pre>
@@ -559,8 +559,7 @@ public abstract class TraceExporter {
   public static final class LoggingServiceHandler extends ServiceHandler {
 
     private static final Logger logger = Logger.getLogger(LoggingServiceHandler.class.getName());
-    private static final String SERVICE_NAME =
-        "com.google.instrumentation.trace.LoggingServiceHandler";
+    private static final String SERVICE_NAME = "io.opencensus.trace.LoggingServiceHandler";
     private static final LoggingServiceHandler INSTANCE = new LoggingServiceHandler();
 
     private LoggingServiceHandler() {}
diff --git a/core/src/main/java/com/google/instrumentation/trace/TraceId.java b/api/src/main/java/io/opencensus/trace/TraceId.java
index ab3c2d52..5684efdf 100644
--- a/core/src/main/java/com/google/instrumentation/trace/TraceId.java
+++ b/api/src/main/java/io/opencensus/trace/TraceId.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/core/src/main/java/com/google/instrumentation/trace/TraceOptions.java b/api/src/main/java/io/opencensus/trace/TraceOptions.java
index cdfec722..6fc04bb9 100644
--- a/core/src/main/java/com/google/instrumentation/trace/TraceOptions.java
+++ b/api/src/main/java/io/opencensus/trace/TraceOptions.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkElementIndex;
diff --git a/core/src/main/java/com/google/instrumentation/trace/Tracer.java b/api/src/main/java/io/opencensus/trace/Tracer.java
index 2c1ccfc6..56c4280d 100644
--- a/core/src/main/java/com/google/instrumentation/trace/Tracer.java
+++ b/api/src/main/java/io/opencensus/trace/Tracer.java
@@ -11,11 +11,11 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
+import io.opencensus.common.NonThrowingCloseable;
 import javax.annotation.Nullable;
 
 /**
diff --git a/core/src/main/java/com/google/instrumentation/trace/Tracing.java b/api/src/main/java/io/opencensus/trace/Tracing.java
index 8759d38b..e6d34a45 100644
--- a/core/src/main/java/com/google/instrumentation/trace/Tracing.java
+++ b/api/src/main/java/io/opencensus/trace/Tracing.java
@@ -11,11 +11,11 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.instrumentation.common.Clock;
-import com.google.instrumentation.internal.Provider;
+import io.opencensus.common.Clock;
+import io.opencensus.internal.Provider;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -76,7 +76,7 @@ public final class Tracing {
     try {
       // Call Class.forName with literal string name of the class to help shading tools.
       return Provider.createInstance(
-          Class.forName("com.google.instrumentation.trace.TraceComponentImpl", true, classLoader),
+          Class.forName("io.opencensus.trace.TraceComponentImpl", true, classLoader),
           TraceComponent.class);
     } catch (ClassNotFoundException e) {
       logger.log(Level.FINE, "Using default implementation for TraceComponent.", e);
diff --git a/core/src/test/java/com/google/instrumentation/common/DurationTest.java b/api/src/test/java/io/opencensus/common/DurationTest.java
index 4ba9806c..b9861eea 100644
--- a/core/src/test/java/com/google/instrumentation/common/DurationTest.java
+++ b/api/src/test/java/io/opencensus/common/DurationTest.java
@@ -1,4 +1,4 @@
-package com.google.instrumentation.common;
+package io.opencensus.common;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -15,14 +15,10 @@ public class DurationTest {
     assertThat(Duration.create(24, 42).getNanos()).isEqualTo(42);
     assertThat(Duration.create(-24, -42).getSeconds()).isEqualTo(-24);
     assertThat(Duration.create(-24, -42).getNanos()).isEqualTo(-42);
-    assertThat(Duration.create(315576000000L, 999999999).getSeconds())
-        .isEqualTo(315576000000L);
-    assertThat(Duration.create(315576000000L, 999999999).getNanos())
-        .isEqualTo(999999999);
-    assertThat(Duration.create(-315576000000L, -999999999).getSeconds())
-        .isEqualTo(-315576000000L);
-    assertThat(Duration.create(-315576000000L, -999999999).getNanos())
-        .isEqualTo(-999999999);
+    assertThat(Duration.create(315576000000L, 999999999).getSeconds()).isEqualTo(315576000000L);
+    assertThat(Duration.create(315576000000L, 999999999).getNanos()).isEqualTo(999999999);
+    assertThat(Duration.create(-315576000000L, -999999999).getSeconds()).isEqualTo(-315576000000L);
+    assertThat(Duration.create(-315576000000L, -999999999).getNanos()).isEqualTo(-999999999);
   }
 
   @Test
diff --git a/core/src/test/java/com/google/instrumentation/common/TimestampTest.java b/api/src/test/java/io/opencensus/common/TimestampTest.java
index d41733a7..5a02264b 100644
--- a/core/src/test/java/com/google/instrumentation/common/TimestampTest.java
+++ b/api/src/test/java/io/opencensus/common/TimestampTest.java
@@ -1,4 +1,4 @@
-package com.google.instrumentation.common;
+package io.opencensus.common;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/core/src/test/java/com/google/instrumentation/internal/ProviderTest.java b/api/src/test/java/io/opencensus/internal/ProviderTest.java
index d8498b43..f6aba5ec 100644
--- a/core/src/test/java/com/google/instrumentation/internal/ProviderTest.java
+++ b/api/src/test/java/io/opencensus/internal/ProviderTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.internal;
+package io.opencensus.internal;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -46,16 +46,14 @@ public class ProviderTest {
   @Test
   public void testGoodClass() {
     assertThat(
-            Provider.<GoodClass>newInstance(
-                "com.google.instrumentation.internal.ProviderTest$GoodClass", null))
+            Provider.<GoodClass>newInstance("io.opencensus.internal.ProviderTest$GoodClass", null))
         .isNotNull();
   }
 
   @Test
   public void testBadClass() {
     assertThat(
-            Provider.<GoodClass>newInstance(
-                "com.google.instrumentation.internal.ProviderTest$BadClass", null))
+            Provider.<GoodClass>newInstance("io.opencensus.internal.ProviderTest$BadClass", null))
         .isNull();
   }
 
@@ -63,7 +61,7 @@ public class ProviderTest {
   public void createInstance_ThrowsErrorWhenClassIsPrivate() throws ClassNotFoundException {
     Provider.createInstance(
         Class.forName(
-            "com.google.instrumentation.internal.ProviderTest$PrivateClass",
+            "io.opencensus.internal.ProviderTest$PrivateClass",
             true,
             Provider.getCorrectClassLoader(ProviderTest.class)),
         PrivateClass.class);
@@ -74,7 +72,7 @@ public class ProviderTest {
       throws ClassNotFoundException {
     Provider.createInstance(
         Class.forName(
-            "com.google.instrumentation.internal.ProviderTest$PrivateConstructorClass",
+            "io.opencensus.internal.ProviderTest$PrivateConstructorClass",
             true,
             Provider.getCorrectClassLoader(ProviderTest.class)),
         PrivateConstructorClass.class);
@@ -85,7 +83,7 @@ public class ProviderTest {
       throws ClassNotFoundException {
     Provider.createInstance(
         Class.forName(
-            "com.google.instrumentation.internal.ProviderTest$NoDefaultConstructorClass",
+            "io.opencensus.internal.ProviderTest$NoDefaultConstructorClass",
             true,
             Provider.getCorrectClassLoader(ProviderTest.class)),
         NoDefaultConstructorClass.class);
@@ -95,7 +93,7 @@ public class ProviderTest {
   public void createInstance_ThrowsErrorWhenClassIsNotASubclass() throws ClassNotFoundException {
     Provider.createInstance(
         Class.forName(
-            "com.google.instrumentation.internal.ProviderTest$GoodClass",
+            "io.opencensus.internal.ProviderTest$GoodClass",
             true,
             Provider.getCorrectClassLoader(ProviderTest.class)),
         MyInterface.class);
@@ -106,7 +104,7 @@ public class ProviderTest {
     assertThat(
             Provider.createInstance(
                 Class.forName(
-                    "com.google.instrumentation.internal.ProviderTest$GoodClass",
+                    "io.opencensus.internal.ProviderTest$GoodClass",
                     true,
                     Provider.getCorrectClassLoader(ProviderTest.class)),
                 GoodClass.class))
@@ -118,7 +116,7 @@ public class ProviderTest {
     assertThat(
             Provider.createInstance(
                 Class.forName(
-                    "com.google.instrumentation.internal.ProviderTest$MyInterfaceImpl",
+                    "io.opencensus.internal.ProviderTest$MyInterfaceImpl",
                     true,
                     Provider.getCorrectClassLoader(ProviderTest.class)),
                 MyInterface.class))
diff --git a/core/src/test/java/com/google/instrumentation/internal/StringUtilTest.java b/api/src/test/java/io/opencensus/internal/StringUtilTest.java
index 26b99af9..14144391 100644
--- a/core/src/test/java/com/google/instrumentation/internal/StringUtilTest.java
+++ b/api/src/test/java/io/opencensus/internal/StringUtilTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.internal;
+package io.opencensus.internal;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -20,9 +20,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/**
- * Tests for {@link StringUtil}.
- */
+/** Tests for {@link StringUtil}. */
 @RunWith(JUnit4.class)
 public final class StringUtilTest {
   @Test
diff --git a/core/src/test/java/com/google/instrumentation/internal/TestClockTest.java b/api/src/test/java/io/opencensus/internal/TestClockTest.java
index 0fee071a..fe3f80cb 100644
--- a/core/src/test/java/com/google/instrumentation/internal/TestClockTest.java
+++ b/api/src/test/java/io/opencensus/internal/TestClockTest.java
@@ -11,19 +11,17 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.internal;
+package io.opencensus.internal;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.common.Duration;
-import com.google.instrumentation.common.Timestamp;
+import io.opencensus.common.Duration;
+import io.opencensus.common.Timestamp;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/**
- * Tests for {@link TestClock}.
- */
+/** Tests for {@link TestClock}. */
 @RunWith(JUnit4.class)
 public final class TestClockTest {
   private static final int NUM_NANOS_PER_SECOND = 1000 * 1000 * 1000;
diff --git a/core/src/test/java/io/opencensus/tags/TagKeyTest.java b/api/src/test/java/io/opencensus/tags/TagKeyTest.java
index aed02d3f..aed02d3f 100644
--- a/core/src/test/java/io/opencensus/tags/TagKeyTest.java
+++ b/api/src/test/java/io/opencensus/tags/TagKeyTest.java
diff --git a/core/src/test/java/io/opencensus/tags/TagMapTest.java b/api/src/test/java/io/opencensus/tags/TagMapTest.java
index 41b3b247..41b3b247 100644
--- a/core/src/test/java/io/opencensus/tags/TagMapTest.java
+++ b/api/src/test/java/io/opencensus/tags/TagMapTest.java
diff --git a/core/src/test/java/com/google/instrumentation/trace/AnnotationTest.java b/api/src/test/java/io/opencensus/trace/AnnotationTest.java
index 4c43e0b5..fbfe5fd3 100644
--- a/core/src/test/java/com/google/instrumentation/trace/AnnotationTest.java
+++ b/api/src/test/java/io/opencensus/trace/AnnotationTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/core/src/test/java/com/google/instrumentation/trace/AttributeValueTest.java b/api/src/test/java/io/opencensus/trace/AttributeValueTest.java
index b609a5ce..7a999604 100644
--- a/core/src/test/java/com/google/instrumentation/trace/AttributeValueTest.java
+++ b/api/src/test/java/io/opencensus/trace/AttributeValueTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/core/src/test/java/com/google/instrumentation/trace/BinaryPropagationHandlerTest.java b/api/src/test/java/io/opencensus/trace/BinaryPropagationHandlerTest.java
index 080a58e3..d75effb6 100644
--- a/core/src/test/java/com/google/instrumentation/trace/BinaryPropagationHandlerTest.java
+++ b/api/src/test/java/io/opencensus/trace/BinaryPropagationHandlerTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/core/src/test/java/com/google/instrumentation/trace/BlankSpanTest.java b/api/src/test/java/io/opencensus/trace/BlankSpanTest.java
index 036e02e8..252d02ff 100644
--- a/core/src/test/java/com/google/instrumentation/trace/BlankSpanTest.java
+++ b/api/src/test/java/io/opencensus/trace/BlankSpanTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/core/src/test/java/com/google/instrumentation/trace/ContextUtilsTest.java b/api/src/test/java/io/opencensus/trace/ContextUtilsTest.java
index 4dabad24..e4513d74 100644
--- a/core/src/test/java/com/google/instrumentation/trace/ContextUtilsTest.java
+++ b/api/src/test/java/io/opencensus/trace/ContextUtilsTest.java
@@ -11,12 +11,12 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
 import io.grpc.Context;
+import io.opencensus.common.NonThrowingCloseable;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/core/src/test/java/com/google/instrumentation/trace/EndSpanOptionsTest.java b/api/src/test/java/io/opencensus/trace/EndSpanOptionsTest.java
index dc59808d..d531fba5 100644
--- a/core/src/test/java/com/google/instrumentation/trace/EndSpanOptionsTest.java
+++ b/api/src/test/java/io/opencensus/trace/EndSpanOptionsTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/core/src/test/java/com/google/instrumentation/trace/LinkTest.java b/api/src/test/java/io/opencensus/trace/LinkTest.java
index e29cd2aa..e1289f33 100644
--- a/core/src/test/java/com/google/instrumentation/trace/LinkTest.java
+++ b/api/src/test/java/io/opencensus/trace/LinkTest.java
@@ -11,12 +11,12 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.testing.EqualsTester;
-import com.google.instrumentation.trace.Link.Type;
+import io.opencensus.trace.Link.Type;
 import java.util.Random;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/core/src/test/java/com/google/instrumentation/trace/NetworkEventTest.java b/api/src/test/java/io/opencensus/trace/NetworkEventTest.java
index 1d6cee73..946e8ce1 100644
--- a/core/src/test/java/com/google/instrumentation/trace/NetworkEventTest.java
+++ b/api/src/test/java/io/opencensus/trace/NetworkEventTest.java
@@ -11,11 +11,11 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.common.Timestamp;
+import io.opencensus.common.Timestamp;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/core/src/test/java/com/google/instrumentation/trace/SamplersTest.java b/api/src/test/java/io/opencensus/trace/SamplersTest.java
index aa361ef8..af7fcaf5 100644
--- a/core/src/test/java/com/google/instrumentation/trace/SamplersTest.java
+++ b/api/src/test/java/io/opencensus/trace/SamplersTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -162,7 +162,6 @@ public class SamplersTest {
 
   @Test
   public void probabilitySampler_ToString() {
-    assertThat((Samplers.probabilitySampler(0.5)).toString())
-        .contains("0.5");
+    assertThat((Samplers.probabilitySampler(0.5)).toString()).contains("0.5");
   }
 }
diff --git a/core/src/test/java/com/google/instrumentation/trace/ScopedSpanHandleTest.java b/api/src/test/java/io/opencensus/trace/ScopedSpanHandleTest.java
index df04cd2e..8922f4c2 100644
--- a/core/src/test/java/com/google/instrumentation/trace/ScopedSpanHandleTest.java
+++ b/api/src/test/java/io/opencensus/trace/ScopedSpanHandleTest.java
@@ -11,13 +11,13 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.same;
 import static org.mockito.Mockito.verify;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
+import io.opencensus.common.NonThrowingCloseable;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/core/src/test/java/com/google/instrumentation/trace/SpanBuilderTest.java b/api/src/test/java/io/opencensus/trace/SpanBuilderTest.java
index 2044d87a..ccd3d806 100644
--- a/core/src/test/java/com/google/instrumentation/trace/SpanBuilderTest.java
+++ b/api/src/test/java/io/opencensus/trace/SpanBuilderTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.eq;
@@ -20,7 +20,7 @@ import static org.mockito.Matchers.same;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
+import io.opencensus.common.NonThrowingCloseable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
diff --git a/core/src/test/java/com/google/instrumentation/trace/SpanContextTest.java b/api/src/test/java/io/opencensus/trace/SpanContextTest.java
index 22d1be2f..c0eb5d40 100644
--- a/core/src/test/java/com/google/instrumentation/trace/SpanContextTest.java
+++ b/api/src/test/java/io/opencensus/trace/SpanContextTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/core/src/test/java/com/google/instrumentation/trace/SpanDataTest.java b/api/src/test/java/io/opencensus/trace/SpanDataTest.java
index 6303dc1b..7a7f7899 100644
--- a/core/src/test/java/com/google/instrumentation/trace/SpanDataTest.java
+++ b/api/src/test/java/io/opencensus/trace/SpanDataTest.java
@@ -11,17 +11,17 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.testing.EqualsTester;
-import com.google.instrumentation.common.Timestamp;
-import com.google.instrumentation.trace.Link.Type;
-import com.google.instrumentation.trace.SpanData.Attributes;
-import com.google.instrumentation.trace.SpanData.Links;
-import com.google.instrumentation.trace.SpanData.TimedEvent;
-import com.google.instrumentation.trace.SpanData.TimedEvents;
+import io.opencensus.common.Timestamp;
+import io.opencensus.trace.Link.Type;
+import io.opencensus.trace.SpanData.Attributes;
+import io.opencensus.trace.SpanData.Links;
+import io.opencensus.trace.SpanData.TimedEvent;
+import io.opencensus.trace.SpanData.TimedEvents;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
diff --git a/core/src/test/java/com/google/instrumentation/trace/SpanIdTest.java b/api/src/test/java/io/opencensus/trace/SpanIdTest.java
index d122bef6..a35fddce 100644
--- a/core/src/test/java/com/google/instrumentation/trace/SpanIdTest.java
+++ b/api/src/test/java/io/opencensus/trace/SpanIdTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/core/src/test/java/com/google/instrumentation/trace/SpanTest.java b/api/src/test/java/io/opencensus/trace/SpanTest.java
index befe182d..c8f7cb50 100644
--- a/core/src/test/java/com/google/instrumentation/trace/SpanTest.java
+++ b/api/src/test/java/io/opencensus/trace/SpanTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.same;
diff --git a/core/src/test/java/com/google/instrumentation/trace/StartSpanOptionsTest.java b/api/src/test/java/io/opencensus/trace/StartSpanOptionsTest.java
index 48f24d34..b91e78ee 100644
--- a/core/src/test/java/com/google/instrumentation/trace/StartSpanOptionsTest.java
+++ b/api/src/test/java/io/opencensus/trace/StartSpanOptionsTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/core/src/test/java/com/google/instrumentation/trace/StatusTest.java b/api/src/test/java/io/opencensus/trace/StatusTest.java
index 42084cb8..c66a3428 100644
--- a/core/src/test/java/com/google/instrumentation/trace/StatusTest.java
+++ b/api/src/test/java/io/opencensus/trace/StatusTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/core/src/test/java/com/google/instrumentation/trace/TraceComponentTest.java b/api/src/test/java/io/opencensus/trace/TraceComponentTest.java
index 9a0db1bf..106cb965 100644
--- a/core/src/test/java/com/google/instrumentation/trace/TraceComponentTest.java
+++ b/api/src/test/java/io/opencensus/trace/TraceComponentTest.java
@@ -11,11 +11,11 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.internal.ZeroTimeClock;
+import io.opencensus.internal.ZeroTimeClock;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/core/src/test/java/com/google/instrumentation/trace/TraceExporterTest.java b/api/src/test/java/io/opencensus/trace/TraceExporterTest.java
index 03adacf7..3837a1ad 100644
--- a/core/src/test/java/com/google/instrumentation/trace/TraceExporterTest.java
+++ b/api/src/test/java/io/opencensus/trace/TraceExporterTest.java
@@ -11,13 +11,13 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
 
-import com.google.instrumentation.trace.TraceExporter.LoggingServiceHandler;
+import io.opencensus.trace.TraceExporter.LoggingServiceHandler;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -40,10 +40,8 @@ public class TraceExporterTest {
     LoggingServiceHandler.registerService(traceExporter);
     verify(traceExporter)
         .registerServiceHandler(
-            eq("com.google.instrumentation.trace.LoggingServiceHandler"),
-            any(LoggingServiceHandler.class));
+            eq("io.opencensus.trace.LoggingServiceHandler"), any(LoggingServiceHandler.class));
     LoggingServiceHandler.unregisterService(traceExporter);
-    verify(traceExporter)
-        .unregisterServiceHandler(eq("com.google.instrumentation.trace.LoggingServiceHandler"));
+    verify(traceExporter).unregisterServiceHandler(eq("io.opencensus.trace.LoggingServiceHandler"));
   }
 }
diff --git a/core/src/test/java/com/google/instrumentation/trace/TraceIdTest.java b/api/src/test/java/io/opencensus/trace/TraceIdTest.java
index ed675ef6..cd1b7c24 100644
--- a/core/src/test/java/com/google/instrumentation/trace/TraceIdTest.java
+++ b/api/src/test/java/io/opencensus/trace/TraceIdTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/core/src/test/java/com/google/instrumentation/trace/TraceOptionsTest.java b/api/src/test/java/io/opencensus/trace/TraceOptionsTest.java
index e1119337..fb240646 100644
--- a/core/src/test/java/com/google/instrumentation/trace/TraceOptionsTest.java
+++ b/api/src/test/java/io/opencensus/trace/TraceOptionsTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/core/src/test/java/com/google/instrumentation/trace/TraceParamsTest.java b/api/src/test/java/io/opencensus/trace/TraceParamsTest.java
index 52e6aecc..60f40deb 100644
--- a/core/src/test/java/com/google/instrumentation/trace/TraceParamsTest.java
+++ b/api/src/test/java/io/opencensus/trace/TraceParamsTest.java
@@ -11,11 +11,11 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.trace.TraceConfig.TraceParams;
+import io.opencensus.trace.TraceConfig.TraceParams;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/core/src/test/java/com/google/instrumentation/trace/TracerTest.java b/api/src/test/java/io/opencensus/trace/TracerTest.java
index 7a19fda0..cc46956c 100644
--- a/core/src/test/java/com/google/instrumentation/trace/TracerTest.java
+++ b/api/src/test/java/io/opencensus/trace/TracerTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.eq;
@@ -20,8 +20,8 @@ import static org.mockito.Matchers.same;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
 import io.grpc.Context;
+import io.opencensus.common.NonThrowingCloseable;
 import java.util.Random;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/core/src/test/java/com/google/instrumentation/trace/TracingTest.java b/api/src/test/java/io/opencensus/trace/TracingTest.java
index ab266954..b7c9be25 100644
--- a/core/src/test/java/com/google/instrumentation/trace/TracingTest.java
+++ b/api/src/test/java/io/opencensus/trace/TracingTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -52,7 +52,7 @@ public class TracingTest {
                     })
                 .getClass()
                 .getName())
-        .isEqualTo("com.google.instrumentation.trace.TraceComponent$NoopTraceComponent");
+        .isEqualTo("io.opencensus.trace.TraceComponent$NoopTraceComponent");
   }
 
   @Test
diff --git a/benchmarks/src/jmh/java/com/google/instrumentation/trace/BinaryPropagationHandlerImplBenchmark.java b/benchmarks/src/jmh/java/io/opencensus/trace/BinaryPropagationHandlerImplBenchmark.java
index fc8d9846..85302d25 100644
--- a/benchmarks/src/jmh/java/com/google/instrumentation/trace/BinaryPropagationHandlerImplBenchmark.java
+++ b/benchmarks/src/jmh/java/io/opencensus/trace/BinaryPropagationHandlerImplBenchmark.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import java.text.ParseException;
 import java.util.concurrent.TimeUnit;
diff --git a/benchmarks/src/jmh/java/com/google/instrumentation/trace/RecordTraceEventsNonSampledSpanBenchmark.java b/benchmarks/src/jmh/java/io/opencensus/trace/RecordTraceEventsNonSampledSpanBenchmark.java
index ad9a66b5..0c3daa87 100644
--- a/benchmarks/src/jmh/java/com/google/instrumentation/trace/RecordTraceEventsNonSampledSpanBenchmark.java
+++ b/benchmarks/src/jmh/java/io/opencensus/trace/RecordTraceEventsNonSampledSpanBenchmark.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
diff --git a/benchmarks/src/jmh/java/com/google/instrumentation/trace/RecordTraceEventsSampledSpanBenchmark.java b/benchmarks/src/jmh/java/io/opencensus/trace/RecordTraceEventsSampledSpanBenchmark.java
index e20af6ea..78a587f4 100644
--- a/benchmarks/src/jmh/java/com/google/instrumentation/trace/RecordTraceEventsSampledSpanBenchmark.java
+++ b/benchmarks/src/jmh/java/io/opencensus/trace/RecordTraceEventsSampledSpanBenchmark.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
diff --git a/benchmarks/src/jmh/java/com/google/instrumentation/trace/StartEndSpanBenchmark.java b/benchmarks/src/jmh/java/io/opencensus/trace/StartEndSpanBenchmark.java
index ee15ad01..9a51ffbe 100644
--- a/benchmarks/src/jmh/java/com/google/instrumentation/trace/StartEndSpanBenchmark.java
+++ b/benchmarks/src/jmh/java/io/opencensus/trace/StartEndSpanBenchmark.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import java.util.concurrent.TimeUnit;
 import org.openjdk.jmh.annotations.Benchmark;
diff --git a/core/build.gradle b/core/build.gradle
index 2520ff4c..333dea0a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -5,7 +5,8 @@ jar {
 }
 
 dependencies {
-    compile libraries.grpc_context,
+    compile project(':opencensus-api'),
+            libraries.grpc_context,
             libraries.guava
     compileOnly libraries.auto_value
 
diff --git a/core/src/main/java/com/google/instrumentation/stats/ContextUtils.java b/core/src/main/java/com/google/instrumentation/stats/ContextUtils.java
index b0f7e6c5..745db2d9 100644
--- a/core/src/main/java/com/google/instrumentation/stats/ContextUtils.java
+++ b/core/src/main/java/com/google/instrumentation/stats/ContextUtils.java
@@ -13,8 +13,8 @@
 
 package com.google.instrumentation.stats;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
 import io.grpc.Context;
+import io.opencensus.common.NonThrowingCloseable;
 
 /**
  * Util methods/functionality to interact with the {@link io.grpc.Context}.
diff --git a/core/src/main/java/com/google/instrumentation/stats/IntervalAggregation.java b/core/src/main/java/com/google/instrumentation/stats/IntervalAggregation.java
index 9bd26923..97c8c6cd 100644
--- a/core/src/main/java/com/google/instrumentation/stats/IntervalAggregation.java
+++ b/core/src/main/java/com/google/instrumentation/stats/IntervalAggregation.java
@@ -13,7 +13,7 @@
 
 package com.google.instrumentation.stats;
 
-import com.google.instrumentation.common.Duration;
+import io.opencensus.common.Duration;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/core/src/main/java/com/google/instrumentation/stats/IntervalAggregationDescriptor.java b/core/src/main/java/com/google/instrumentation/stats/IntervalAggregationDescriptor.java
index ada61fb6..3af843bb 100644
--- a/core/src/main/java/com/google/instrumentation/stats/IntervalAggregationDescriptor.java
+++ b/core/src/main/java/com/google/instrumentation/stats/IntervalAggregationDescriptor.java
@@ -13,7 +13,7 @@
 
 package com.google.instrumentation.stats;
 
-import com.google.instrumentation.common.Duration;
+import io.opencensus.common.Duration;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/core/src/main/java/com/google/instrumentation/stats/MeasurementDescriptor.java b/core/src/main/java/com/google/instrumentation/stats/MeasurementDescriptor.java
index d44c4eab..e34c76fa 100644
--- a/core/src/main/java/com/google/instrumentation/stats/MeasurementDescriptor.java
+++ b/core/src/main/java/com/google/instrumentation/stats/MeasurementDescriptor.java
@@ -14,7 +14,7 @@
 package com.google.instrumentation.stats;
 
 import com.google.auto.value.AutoValue;
-import com.google.instrumentation.internal.StringUtil;
+import io.opencensus.internal.StringUtil;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/core/src/main/java/com/google/instrumentation/stats/RpcConstants.java b/core/src/main/java/com/google/instrumentation/stats/RpcConstants.java
index 5a89e564..c2663368 100644
--- a/core/src/main/java/com/google/instrumentation/stats/RpcConstants.java
+++ b/core/src/main/java/com/google/instrumentation/stats/RpcConstants.java
@@ -13,11 +13,11 @@
 
 package com.google.instrumentation.stats;
 
-import com.google.instrumentation.common.Duration;
 import com.google.instrumentation.stats.MeasurementDescriptor.BasicUnit;
 import com.google.instrumentation.stats.MeasurementDescriptor.MeasurementUnit;
 import com.google.instrumentation.stats.ViewDescriptor.DistributionViewDescriptor;
 import com.google.instrumentation.stats.ViewDescriptor.IntervalViewDescriptor;
+import io.opencensus.common.Duration;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/core/src/main/java/com/google/instrumentation/stats/RpcViewConstants.java b/core/src/main/java/com/google/instrumentation/stats/RpcViewConstants.java
index 72d62236..2da8bc1c 100644
--- a/core/src/main/java/com/google/instrumentation/stats/RpcViewConstants.java
+++ b/core/src/main/java/com/google/instrumentation/stats/RpcViewConstants.java
@@ -39,9 +39,10 @@ import static com.google.instrumentation.stats.RpcMeasurementConstants.RPC_SERVE
 import static com.google.instrumentation.stats.RpcMeasurementConstants.RPC_SERVER_UNCOMPRESSED_RESPONSE_BYTES;
 import static com.google.instrumentation.stats.RpcMeasurementConstants.RPC_STATUS;
 
-import com.google.instrumentation.common.Duration;
 import com.google.instrumentation.stats.ViewDescriptor.DistributionViewDescriptor;
 import com.google.instrumentation.stats.ViewDescriptor.IntervalViewDescriptor;
+import io.opencensus.common.Duration;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/core/src/main/java/com/google/instrumentation/stats/Stats.java b/core/src/main/java/com/google/instrumentation/stats/Stats.java
index 31c2449e..90f366c8 100644
--- a/core/src/main/java/com/google/instrumentation/stats/Stats.java
+++ b/core/src/main/java/com/google/instrumentation/stats/Stats.java
@@ -13,7 +13,7 @@
 
 package com.google.instrumentation.stats;
 
-import com.google.instrumentation.internal.Provider;
+import io.opencensus.internal.Provider;
 import javax.annotation.Nullable;
 
 /**
diff --git a/core/src/main/java/com/google/instrumentation/stats/StatsContextFactory.java b/core/src/main/java/com/google/instrumentation/stats/StatsContextFactory.java
index 238d122f..88ac718e 100644
--- a/core/src/main/java/com/google/instrumentation/stats/StatsContextFactory.java
+++ b/core/src/main/java/com/google/instrumentation/stats/StatsContextFactory.java
@@ -15,7 +15,7 @@ package com.google.instrumentation.stats;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
+import io.opencensus.common.NonThrowingCloseable;
 import java.io.IOException;
 import java.io.InputStream;
 
diff --git a/core/src/main/java/com/google/instrumentation/stats/TagKey.java b/core/src/main/java/com/google/instrumentation/stats/TagKey.java
index 87320287..c0531e77 100644
--- a/core/src/main/java/com/google/instrumentation/stats/TagKey.java
+++ b/core/src/main/java/com/google/instrumentation/stats/TagKey.java
@@ -14,7 +14,7 @@
 package com.google.instrumentation.stats;
 
 import com.google.auto.value.AutoValue;
-import com.google.instrumentation.internal.StringUtil;
+import io.opencensus.internal.StringUtil;
 import javax.annotation.concurrent.Immutable;
 
 /**
diff --git a/core/src/main/java/com/google/instrumentation/stats/TagValue.java b/core/src/main/java/com/google/instrumentation/stats/TagValue.java
index f27003b4..18cfd192 100644
--- a/core/src/main/java/com/google/instrumentation/stats/TagValue.java
+++ b/core/src/main/java/com/google/instrumentation/stats/TagValue.java
@@ -14,7 +14,7 @@
 package com.google.instrumentation.stats;
 
 import com.google.auto.value.AutoValue;
-import com.google.instrumentation.internal.StringUtil;
+import io.opencensus.internal.StringUtil;
 import javax.annotation.concurrent.Immutable;
 
 /**
diff --git a/core/src/main/java/com/google/instrumentation/stats/View.java b/core/src/main/java/com/google/instrumentation/stats/View.java
index 34ed8b95..56fbb767 100644
--- a/core/src/main/java/com/google/instrumentation/stats/View.java
+++ b/core/src/main/java/com/google/instrumentation/stats/View.java
@@ -14,10 +14,11 @@
 package com.google.instrumentation.stats;
 
 import com.google.auto.value.AutoValue;
-import com.google.instrumentation.common.Function;
-import com.google.instrumentation.common.Timestamp;
 import com.google.instrumentation.stats.ViewDescriptor.DistributionViewDescriptor;
 import com.google.instrumentation.stats.ViewDescriptor.IntervalViewDescriptor;
+import io.opencensus.common.Function;
+import io.opencensus.common.Timestamp;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/core/src/main/java/com/google/instrumentation/stats/ViewDescriptor.java b/core/src/main/java/com/google/instrumentation/stats/ViewDescriptor.java
index 5550795f..99e408ac 100644
--- a/core/src/main/java/com/google/instrumentation/stats/ViewDescriptor.java
+++ b/core/src/main/java/com/google/instrumentation/stats/ViewDescriptor.java
@@ -14,7 +14,7 @@
 package com.google.instrumentation.stats;
 
 import com.google.auto.value.AutoValue;
-import com.google.instrumentation.common.Function;
+import io.opencensus.common.Function;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/core/src/test/java/com/google/instrumentation/stats/ContextUtilsTest.java b/core/src/test/java/com/google/instrumentation/stats/ContextUtilsTest.java
index a8a77be7..5affcf3f 100644
--- a/core/src/test/java/com/google/instrumentation/stats/ContextUtilsTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/ContextUtilsTest.java
@@ -15,7 +15,7 @@ package com.google.instrumentation.stats;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
+import io.opencensus.common.NonThrowingCloseable;
 import io.grpc.Context;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/core/src/test/java/com/google/instrumentation/stats/IntervalAggregationDescriptorTest.java b/core/src/test/java/com/google/instrumentation/stats/IntervalAggregationDescriptorTest.java
index 3c8a5e45..7becbc22 100644
--- a/core/src/test/java/com/google/instrumentation/stats/IntervalAggregationDescriptorTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/IntervalAggregationDescriptorTest.java
@@ -15,7 +15,7 @@ package com.google.instrumentation.stats;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.common.Duration;
+import io.opencensus.common.Duration;
 import java.util.Arrays;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/core/src/test/java/com/google/instrumentation/stats/IntervalAggregationTest.java b/core/src/test/java/com/google/instrumentation/stats/IntervalAggregationTest.java
index a436ff0b..0f92035a 100644
--- a/core/src/test/java/com/google/instrumentation/stats/IntervalAggregationTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/IntervalAggregationTest.java
@@ -15,7 +15,7 @@ package com.google.instrumentation.stats;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.common.Duration;
+import io.opencensus.common.Duration;
 import com.google.instrumentation.stats.IntervalAggregation.Interval;
 import java.util.Arrays;
 import java.util.List;
diff --git a/core/src/test/java/com/google/instrumentation/stats/MeasurementDescriptorTest.java b/core/src/test/java/com/google/instrumentation/stats/MeasurementDescriptorTest.java
index ca3ddb82..a34b9897 100644
--- a/core/src/test/java/com/google/instrumentation/stats/MeasurementDescriptorTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/MeasurementDescriptorTest.java
@@ -16,7 +16,7 @@ package com.google.instrumentation.stats;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.testing.EqualsTester;
-import com.google.instrumentation.internal.StringUtil;
+import io.opencensus.internal.StringUtil;
 import com.google.instrumentation.stats.MeasurementDescriptor.BasicUnit;
 import com.google.instrumentation.stats.MeasurementDescriptor.MeasurementUnit;
 import java.util.Arrays;
diff --git a/core/src/test/java/com/google/instrumentation/stats/TagKeyTest.java b/core/src/test/java/com/google/instrumentation/stats/TagKeyTest.java
index 7f106f3d..c0c8657b 100644
--- a/core/src/test/java/com/google/instrumentation/stats/TagKeyTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/TagKeyTest.java
@@ -16,7 +16,7 @@ package com.google.instrumentation.stats;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.testing.EqualsTester;
-import com.google.instrumentation.internal.StringUtil;
+import io.opencensus.internal.StringUtil;
 import java.util.Arrays;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/core/src/test/java/com/google/instrumentation/stats/TagValueTest.java b/core/src/test/java/com/google/instrumentation/stats/TagValueTest.java
index 8f7e4a8d..b3e663ec 100644
--- a/core/src/test/java/com/google/instrumentation/stats/TagValueTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/TagValueTest.java
@@ -16,7 +16,7 @@ package com.google.instrumentation.stats;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.testing.EqualsTester;
-import com.google.instrumentation.internal.StringUtil;
+import io.opencensus.internal.StringUtil;
 import java.util.Arrays;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/core/src/test/java/com/google/instrumentation/stats/ViewDescriptorTest.java b/core/src/test/java/com/google/instrumentation/stats/ViewDescriptorTest.java
index 89f843c4..f9f3bc2d 100644
--- a/core/src/test/java/com/google/instrumentation/stats/ViewDescriptorTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/ViewDescriptorTest.java
@@ -18,8 +18,8 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.testing.EqualsTester;
-import com.google.instrumentation.common.Duration;
-import com.google.instrumentation.common.Function;
+import io.opencensus.common.Duration;
+import io.opencensus.common.Function;
 import com.google.instrumentation.stats.MeasurementDescriptor.BasicUnit;
 import com.google.instrumentation.stats.MeasurementDescriptor.MeasurementUnit;
 import com.google.instrumentation.stats.ViewDescriptor.DistributionViewDescriptor;
diff --git a/core/src/test/java/com/google/instrumentation/stats/ViewTest.java b/core/src/test/java/com/google/instrumentation/stats/ViewTest.java
index 73462b19..6f899f16 100644
--- a/core/src/test/java/com/google/instrumentation/stats/ViewTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/ViewTest.java
@@ -17,9 +17,9 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.testing.EqualsTester;
-import com.google.instrumentation.common.Duration;
-import com.google.instrumentation.common.Function;
-import com.google.instrumentation.common.Timestamp;
+import io.opencensus.common.Duration;
+import io.opencensus.common.Function;
+import io.opencensus.common.Timestamp;
 import com.google.instrumentation.stats.DistributionAggregation.Range;
 import com.google.instrumentation.stats.IntervalAggregation.Interval;
 import com.google.instrumentation.stats.MeasurementDescriptor.BasicUnit;
diff --git a/core_impl/src/main/java/com/google/instrumentation/stats/MeasurementDescriptorToViewMap.java b/core_impl/src/main/java/com/google/instrumentation/stats/MeasurementDescriptorToViewMap.java
index 19ca1ec7..8bd35aae 100644
--- a/core_impl/src/main/java/com/google/instrumentation/stats/MeasurementDescriptorToViewMap.java
+++ b/core_impl/src/main/java/com/google/instrumentation/stats/MeasurementDescriptorToViewMap.java
@@ -15,12 +15,13 @@ package com.google.instrumentation.stats;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.google.instrumentation.common.Clock;
-import com.google.instrumentation.common.Function;
 import com.google.instrumentation.stats.MutableView.MutableDistributionView;
 import com.google.instrumentation.stats.MutableView.MutableIntervalView;
 import com.google.instrumentation.stats.ViewDescriptor.DistributionViewDescriptor;
 import com.google.instrumentation.stats.ViewDescriptor.IntervalViewDescriptor;
+import io.opencensus.common.Clock;
+import io.opencensus.common.Function;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core_impl/src/main/java/com/google/instrumentation/stats/MutableView.java b/core_impl/src/main/java/com/google/instrumentation/stats/MutableView.java
index 55636cd0..141c4a91 100644
--- a/core_impl/src/main/java/com/google/instrumentation/stats/MutableView.java
+++ b/core_impl/src/main/java/com/google/instrumentation/stats/MutableView.java
@@ -14,11 +14,12 @@
 package com.google.instrumentation.stats;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.instrumentation.common.Clock;
-import com.google.instrumentation.common.Timestamp;
 import com.google.instrumentation.stats.View.DistributionView;
 import com.google.instrumentation.stats.ViewDescriptor.DistributionViewDescriptor;
 import com.google.instrumentation.stats.ViewDescriptor.IntervalViewDescriptor;
+import io.opencensus.common.Clock;
+import io.opencensus.common.Timestamp;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/core_impl/src/main/java/com/google/instrumentation/stats/StatsManagerImplBase.java b/core_impl/src/main/java/com/google/instrumentation/stats/StatsManagerImplBase.java
index e4bf1a41..746ce873 100644
--- a/core_impl/src/main/java/com/google/instrumentation/stats/StatsManagerImplBase.java
+++ b/core_impl/src/main/java/com/google/instrumentation/stats/StatsManagerImplBase.java
@@ -13,8 +13,8 @@
 
 package com.google.instrumentation.stats;
 
-import com.google.instrumentation.common.Clock;
-import com.google.instrumentation.common.EventQueue;
+import io.opencensus.common.Clock;
+import io.opencensus.common.EventQueue;
 
 /**
  * Base implementation of {@link StatsManager}.
diff --git a/core_impl/src/main/java/com/google/instrumentation/stats/StatsSerializer.java b/core_impl/src/main/java/com/google/instrumentation/stats/StatsSerializer.java
index 108c961c..13e5450a 100644
--- a/core_impl/src/main/java/com/google/instrumentation/stats/StatsSerializer.java
+++ b/core_impl/src/main/java/com/google/instrumentation/stats/StatsSerializer.java
@@ -15,7 +15,7 @@ package com.google.instrumentation.stats;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.io.ByteStreams;
-import com.google.instrumentation.internal.VarInt;
+import io.opencensus.internal.VarInt;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/core_impl/src/main/java/com/google/instrumentation/stats/ViewManager.java b/core_impl/src/main/java/com/google/instrumentation/stats/ViewManager.java
index 6cb242c8..dc74a185 100644
--- a/core_impl/src/main/java/com/google/instrumentation/stats/ViewManager.java
+++ b/core_impl/src/main/java/com/google/instrumentation/stats/ViewManager.java
@@ -13,9 +13,9 @@
 
 package com.google.instrumentation.stats;
 
-import com.google.instrumentation.common.Clock;
-import com.google.instrumentation.common.EventQueue;
 import com.google.instrumentation.stats.ViewDescriptor.DistributionViewDescriptor;
+import io.opencensus.common.Clock;
+import io.opencensus.common.EventQueue;
 
 /** Object that stores all views and stats. */
 final class ViewManager {
diff --git a/core_impl/src/main/java/com/google/instrumentation/common/EventQueue.java b/core_impl/src/main/java/io/opencensus/common/EventQueue.java
index e0585f1d..6026d104 100644
--- a/core_impl/src/main/java/com/google/instrumentation/common/EventQueue.java
+++ b/core_impl/src/main/java/io/opencensus/common/EventQueue.java
@@ -11,17 +11,15 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.common;
+package io.opencensus.common;
 
-/**
- * A queue that processes events. See {@code DisruptorEventQueue} for an example.
- */
+/** A queue that processes events. See {@code DisruptorEventQueue} for an example. */
 public interface EventQueue {
   void enqueue(Entry entry);
 
   /**
-   * Base interface to be used for all entries in {@link EventQueue}. For example usage,
-   * see {@code DisruptorEventQueue}.
+   * Base interface to be used for all entries in {@link EventQueue}. For example usage, see {@code
+   * DisruptorEventQueue}.
    */
   public interface Entry {
     /**
diff --git a/core_impl/src/main/java/com/google/instrumentation/common/MillisClock.java b/core_impl/src/main/java/io/opencensus/common/MillisClock.java
index a1be48ea..fc1ac121 100644
--- a/core_impl/src/main/java/com/google/instrumentation/common/MillisClock.java
+++ b/core_impl/src/main/java/io/opencensus/common/MillisClock.java
@@ -11,13 +11,11 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.common;
+package io.opencensus.common;
 
 import javax.annotation.concurrent.ThreadSafe;
 
-/**
- * A {@link Clock} that uses {@link System#currentTimeMillis()} and {@link System#nanoTime()}.
- */
+/** A {@link Clock} that uses {@link System#currentTimeMillis()} and {@link System#nanoTime()}. */
 @ThreadSafe
 public final class MillisClock extends Clock {
   private static final MillisClock INSTANCE = new MillisClock();
diff --git a/core_impl/src/main/java/com/google/instrumentation/common/SimpleEventQueue.java b/core_impl/src/main/java/io/opencensus/common/SimpleEventQueue.java
index 3ec3caa5..b39a2590 100644
--- a/core_impl/src/main/java/com/google/instrumentation/common/SimpleEventQueue.java
+++ b/core_impl/src/main/java/io/opencensus/common/SimpleEventQueue.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.common;
+package io.opencensus.common;
 
 /**
  * An {@link EventQueue} that processes events in the current thread. This class can be used for
diff --git a/core_impl/src/main/java/com/google/instrumentation/internal/VarInt.java b/core_impl/src/main/java/io/opencensus/internal/VarInt.java
index d3d85bf3..2ac5c4e0 100644
--- a/core_impl/src/main/java/com/google/instrumentation/internal/VarInt.java
+++ b/core_impl/src/main/java/io/opencensus/internal/VarInt.java
@@ -11,34 +11,28 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.internal;
+package io.opencensus.internal;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
-/**
- * Common methods to encode and decode varints and varlongs into ByteBuffers and
- * arrays.
- */
+/** Common methods to encode and decode varints and varlongs into ByteBuffers and arrays. */
 // CHECKSTYLE:OFF
 public class VarInt {
 
-  /**
-   * Maximum encoded size of 32-bit positive integers (in bytes)
-   */
+  /** Maximum encoded size of 32-bit positive integers (in bytes) */
   public static final int MAX_VARINT_SIZE = 5;
 
-  /**
-   * maximum encoded size of 64-bit longs, and negative 32-bit ints (in bytes)
-   */
+  /** maximum encoded size of 64-bit longs, and negative 32-bit ints (in bytes) */
   public static final int MAX_VARLONG_SIZE = 10;
 
-  private VarInt() { }
+  private VarInt() {}
 
   /**
    * Returns the encoding size in bytes of its input value.
+   *
    * @param i the integer to be measured
    * @return the encoding size in bytes of its input value
    */
@@ -52,8 +46,8 @@ public class VarInt {
   }
 
   /**
-   * Reads a varint  from src, places its values into the first element of
-   * dst and returns the offset in to src of the first byte after the varint.
+   * Reads a varint from src, places its values into the first element of dst and returns the offset
+   * in to src of the first byte after the varint.
    *
    * @param src source buffer to retrieve from
    * @param offset offset within src
@@ -79,8 +73,8 @@ public class VarInt {
   }
 
   /**
-   * Encodes an integer in a variable-length encoding, 7 bits per byte, into a
-   * destination byte[], following the protocol buffer convention.
+   * Encodes an integer in a variable-length encoding, 7 bits per byte, into a destination byte[],
+   * following the protocol buffer convention.
    *
    * @param v the int value to write to sink
    * @param sink the sink buffer to write to
@@ -99,11 +93,10 @@ public class VarInt {
   }
 
   /**
-   * Reads a varint from the current position of the given ByteBuffer and
-   * returns the decoded value as 32 bit integer.
+   * Reads a varint from the current position of the given ByteBuffer and returns the decoded value
+   * as 32 bit integer.
    *
-   * <p>The position of the buffer is advanced to the first byte after the
-   * decoded varint.
+   * <p>The position of the buffer is advanced to the first byte after the decoded varint.
    *
    * @param src the ByteBuffer to get the var int from
    * @return The integer value of the decoded varint
@@ -140,8 +133,8 @@ public class VarInt {
   }
 
   /**
-   * Encodes an integer in a variable-length encoding, 7 bits per byte, to a
-   * ByteBuffer sink.
+   * Encodes an integer in a variable-length encoding, 7 bits per byte, to a ByteBuffer sink.
+   *
    * @param v the value to encode
    * @param sink the ByteBuffer to add the encoded value
    */
@@ -158,8 +151,7 @@ public class VarInt {
   }
 
   /**
-   * Reads a varint from the given InputStream and returns the decoded value
-   * as an int.
+   * Reads a varint from the given InputStream and returns the decoded value as an int.
    *
    * @param inputStream the InputStream to read from
    */
@@ -181,8 +173,8 @@ public class VarInt {
   }
 
   /**
-   * Encodes an integer in a variable-length encoding, 7 bits per byte, and
-   * writes it to the given OutputStream.
+   * Encodes an integer in a variable-length encoding, 7 bits per byte, and writes it to the given
+   * OutputStream.
    *
    * @param v the value to encode
    * @param outputStream the OutputStream to write to
@@ -209,11 +201,10 @@ public class VarInt {
   }
 
   /**
-   * Reads an up to 64 bit long varint from the current position of the
-   * given ByteBuffer and returns the decoded value as long.
+   * Reads an up to 64 bit long varint from the current position of the given ByteBuffer and returns
+   * the decoded value as long.
    *
-   * <p>The position of the buffer is advanced to the first byte after the
-   * decoded varint.
+   * <p>The position of the buffer is advanced to the first byte after the decoded varint.
    *
    * @param src the ByteBuffer to get the var int from
    * @return The integer value of the decoded long varint
@@ -269,8 +260,8 @@ public class VarInt {
   }
 
   /**
-   * Encodes a long integer in a variable-length encoding, 7 bits per byte, to a
-   * ByteBuffer sink.
+   * Encodes a long integer in a variable-length encoding, 7 bits per byte, to a ByteBuffer sink.
+   *
    * @param v the value to encode
    * @param sink the ByteBuffer to add the encoded value
    */
diff --git a/core/src/main/java/com/google/instrumentation/internal/package-info.java b/core_impl/src/main/java/io/opencensus/internal/package-info.java
index 84939705..5fe0010d 100644
--- a/core/src/main/java/com/google/instrumentation/internal/package-info.java
+++ b/core_impl/src/main/java/io/opencensus/internal/package-info.java
@@ -15,7 +15,7 @@
  * Interfaces and implementations that are internal to opencensus.
  *
  * <p>All the content under this package and its subpackages are considered annotated with {@link
- * com.google.instrumentation.common.Internal}.
+ * io.opencensus.common.Internal}.
  */
-@com.google.instrumentation.common.Internal
-package com.google.instrumentation.internal;
+@io.opencensus.common.Internal
+package io.opencensus.internal;
diff --git a/core_impl/src/main/java/com/google/instrumentation/trace/BinaryPropagationHandlerImpl.java b/core_impl/src/main/java/io/opencensus/trace/BinaryPropagationHandlerImpl.java
index 2a453279..7f51eb3e 100644
--- a/core_impl/src/main/java/com/google/instrumentation/trace/BinaryPropagationHandlerImpl.java
+++ b/core_impl/src/main/java/io/opencensus/trace/BinaryPropagationHandlerImpl.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/core_impl/src/main/java/com/google/instrumentation/trace/RandomHandler.java b/core_impl/src/main/java/io/opencensus/trace/RandomHandler.java
index e5f4ea94..b687881d 100644
--- a/core_impl/src/main/java/com/google/instrumentation/trace/RandomHandler.java
+++ b/core_impl/src/main/java/io/opencensus/trace/RandomHandler.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import java.security.SecureRandom;
 import java.util.Random;
diff --git a/core_impl/src/main/java/com/google/instrumentation/trace/SpanFactoryImpl.java b/core_impl/src/main/java/io/opencensus/trace/SpanFactoryImpl.java
index 38c1c5f8..695a2215 100644
--- a/core_impl/src/main/java/com/google/instrumentation/trace/SpanFactoryImpl.java
+++ b/core_impl/src/main/java/io/opencensus/trace/SpanFactoryImpl.java
@@ -11,14 +11,14 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.instrumentation.common.Clock;
-import com.google.instrumentation.trace.Link.Type;
-import com.google.instrumentation.trace.Span.Options;
-import com.google.instrumentation.trace.TraceConfig.TraceParams;
+import io.opencensus.common.Clock;
+import io.opencensus.trace.Link.Type;
+import io.opencensus.trace.Span.Options;
+import io.opencensus.trace.TraceConfig.TraceParams;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
diff --git a/core_impl/src/main/java/com/google/instrumentation/trace/SpanImpl.java b/core_impl/src/main/java/io/opencensus/trace/SpanImpl.java
index 4ba7f0d4..2fcb7cb7 100644
--- a/core_impl/src/main/java/com/google/instrumentation/trace/SpanImpl.java
+++ b/core_impl/src/main/java/io/opencensus/trace/SpanImpl.java
@@ -11,15 +11,15 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
 import com.google.common.collect.EvictingQueue;
-import com.google.instrumentation.common.Clock;
-import com.google.instrumentation.trace.SpanData.TimedEvent;
-import com.google.instrumentation.trace.TraceConfig.TraceParams;
+import io.opencensus.common.Clock;
+import io.opencensus.trace.SpanData.TimedEvent;
+import io.opencensus.trace.TraceConfig.TraceParams;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
diff --git a/core_impl/src/main/java/com/google/instrumentation/trace/TimestampConverter.java b/core_impl/src/main/java/io/opencensus/trace/TimestampConverter.java
index 5a015887..2e8982ac 100644
--- a/core_impl/src/main/java/com/google/instrumentation/trace/TimestampConverter.java
+++ b/core_impl/src/main/java/io/opencensus/trace/TimestampConverter.java
@@ -11,10 +11,10 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
-import com.google.instrumentation.common.Clock;
-import com.google.instrumentation.common.Timestamp;
+import io.opencensus.common.Clock;
+import io.opencensus.common.Timestamp;
 import javax.annotation.concurrent.Immutable;
 
 /**
diff --git a/core_impl/src/main/java/com/google/instrumentation/trace/TraceComponentImplBase.java b/core_impl/src/main/java/io/opencensus/trace/TraceComponentImplBase.java
index 6b0c693b..7e25dada 100644
--- a/core_impl/src/main/java/com/google/instrumentation/trace/TraceComponentImplBase.java
+++ b/core_impl/src/main/java/io/opencensus/trace/TraceComponentImplBase.java
@@ -11,10 +11,10 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
-import com.google.instrumentation.common.Clock;
-import com.google.instrumentation.common.EventQueue;
+import io.opencensus.common.Clock;
+import io.opencensus.common.EventQueue;
 
 /** Base implementation of the {@link TraceComponent}. */
 class TraceComponentImplBase extends TraceComponent {
@@ -30,8 +30,9 @@ class TraceComponentImplBase extends TraceComponent {
 
   TraceComponentImplBase(Clock clock, RandomHandler randomHandler, EventQueue eventQueue) {
     this.clock = clock;
-    TraceExporterImpl traceExporterImpl = TraceExporterImpl.create(TRACE_EXPORTER_BUFFER_SIZE,
-        TRACE_EXPORTER_SCHEDULE_DELAY_MS, eventQueue);
+    TraceExporterImpl traceExporterImpl =
+        TraceExporterImpl.create(
+            TRACE_EXPORTER_BUFFER_SIZE, TRACE_EXPORTER_SCHEDULE_DELAY_MS, eventQueue);
     traceExporter = traceExporterImpl;
     tracer = new TracerImpl(randomHandler, traceExporterImpl, clock, traceConfig);
   }
diff --git a/core_impl/src/main/java/com/google/instrumentation/trace/TraceConfigImpl.java b/core_impl/src/main/java/io/opencensus/trace/TraceConfigImpl.java
index c7b40d27..eef2be79 100644
--- a/core_impl/src/main/java/com/google/instrumentation/trace/TraceConfigImpl.java
+++ b/core_impl/src/main/java/io/opencensus/trace/TraceConfigImpl.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 /**
  * Global configuration of the trace service. This allows users to change configs for the default
diff --git a/core_impl/src/main/java/com/google/instrumentation/trace/TraceExporterImpl.java b/core_impl/src/main/java/io/opencensus/trace/TraceExporterImpl.java
index 1057d8b4..d42c2c34 100644
--- a/core_impl/src/main/java/com/google/instrumentation/trace/TraceExporterImpl.java
+++ b/core_impl/src/main/java/io/opencensus/trace/TraceExporterImpl.java
@@ -11,11 +11,11 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.instrumentation.common.EventQueue;
-import com.google.instrumentation.trace.SpanImpl.StartEndHandler;
+import io.opencensus.common.EventQueue;
+import io.opencensus.trace.SpanImpl.StartEndHandler;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedList;
diff --git a/core_impl/src/main/java/com/google/instrumentation/trace/TracerImpl.java b/core_impl/src/main/java/io/opencensus/trace/TracerImpl.java
index 218124bb..996607ce 100644
--- a/core_impl/src/main/java/com/google/instrumentation/trace/TracerImpl.java
+++ b/core_impl/src/main/java/io/opencensus/trace/TracerImpl.java
@@ -11,9 +11,9 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
-import com.google.instrumentation.common.Clock;
+import io.opencensus.common.Clock;
 
 /** Implementation of the {@link Tracer}. */
 final class TracerImpl extends Tracer {
diff --git a/core_impl/src/test/java/com/google/instrumentation/stats/MeasurementDescriptorToViewMapTest.java b/core_impl/src/test/java/com/google/instrumentation/stats/MeasurementDescriptorToViewMapTest.java
index 1efc5949..1b4bdf7b 100644
--- a/core_impl/src/test/java/com/google/instrumentation/stats/MeasurementDescriptorToViewMapTest.java
+++ b/core_impl/src/test/java/com/google/instrumentation/stats/MeasurementDescriptorToViewMapTest.java
@@ -16,9 +16,9 @@ package com.google.instrumentation.stats;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
-import com.google.instrumentation.common.Function;
-import com.google.instrumentation.common.Timestamp;
-import com.google.instrumentation.internal.TestClock;
+import io.opencensus.common.Function;
+import io.opencensus.common.Timestamp;
+import io.opencensus.internal.TestClock;
 import com.google.instrumentation.stats.MeasurementDescriptor.BasicUnit;
 import com.google.instrumentation.stats.MeasurementDescriptor.MeasurementUnit;
 import com.google.instrumentation.stats.View.DistributionView;
diff --git a/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextFactoryTest.java b/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextFactoryTest.java
index 217695a2..72d880f6 100644
--- a/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextFactoryTest.java
+++ b/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextFactoryTest.java
@@ -15,10 +15,10 @@ package com.google.instrumentation.stats;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
-import com.google.instrumentation.common.SimpleEventQueue;
-import com.google.instrumentation.internal.TestClock;
-import com.google.instrumentation.internal.VarInt;
+import io.opencensus.common.NonThrowingCloseable;
+import io.opencensus.common.SimpleEventQueue;
+import io.opencensus.internal.TestClock;
+import io.opencensus.internal.VarInt;
 import io.grpc.Context;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextTest.java b/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextTest.java
index 818e328c..9b68f942 100644
--- a/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextTest.java
+++ b/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextTest.java
@@ -18,10 +18,10 @@ import static org.junit.Assert.fail;
 
 import com.google.common.collect.Collections2;
 import com.google.common.testing.EqualsTester;
-import com.google.instrumentation.common.Function;
-import com.google.instrumentation.common.SimpleEventQueue;
-import com.google.instrumentation.internal.TestClock;
-import com.google.instrumentation.internal.VarInt;
+import io.opencensus.common.Function;
+import io.opencensus.common.SimpleEventQueue;
+import io.opencensus.internal.TestClock;
+import io.opencensus.internal.VarInt;
 import com.google.instrumentation.stats.View.DistributionView;
 import com.google.instrumentation.stats.View.IntervalView;
 import java.io.ByteArrayInputStream;
diff --git a/core_impl/src/test/java/com/google/instrumentation/stats/StatsManagerImplTest.java b/core_impl/src/test/java/com/google/instrumentation/stats/StatsManagerImplTest.java
index 0bd23d97..bdd98ca1 100644
--- a/core_impl/src/test/java/com/google/instrumentation/stats/StatsManagerImplTest.java
+++ b/core_impl/src/test/java/com/google/instrumentation/stats/StatsManagerImplTest.java
@@ -16,10 +16,10 @@ package com.google.instrumentation.stats;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.instrumentation.stats.StatsTestUtil.createContext;
 
-import com.google.instrumentation.common.Duration;
-import com.google.instrumentation.common.SimpleEventQueue;
-import com.google.instrumentation.common.Timestamp;
-import com.google.instrumentation.internal.TestClock;
+import io.opencensus.common.Duration;
+import io.opencensus.common.SimpleEventQueue;
+import io.opencensus.common.Timestamp;
+import io.opencensus.internal.TestClock;
 import com.google.instrumentation.stats.MeasurementDescriptor.BasicUnit;
 import com.google.instrumentation.stats.MeasurementDescriptor.MeasurementUnit;
 import com.google.instrumentation.stats.View.DistributionView;
diff --git a/core_impl/src/test/java/com/google/instrumentation/trace/BinaryPropagationHandlerImplTest.java b/core_impl/src/test/java/io/opencensus/trace/BinaryPropagationHandlerImplTest.java
index 20c11c6f..c6ea04e6 100644
--- a/core_impl/src/test/java/com/google/instrumentation/trace/BinaryPropagationHandlerImplTest.java
+++ b/core_impl/src/test/java/io/opencensus/trace/BinaryPropagationHandlerImplTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
diff --git a/core_impl/src/test/java/com/google/instrumentation/trace/SpanFactoryImplTest.java b/core_impl/src/test/java/io/opencensus/trace/SpanFactoryImplTest.java
index 7411920f..bc2bbfb2 100644
--- a/core_impl/src/test/java/com/google/instrumentation/trace/SpanFactoryImplTest.java
+++ b/core_impl/src/test/java/io/opencensus/trace/SpanFactoryImplTest.java
@@ -11,15 +11,15 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
-import com.google.instrumentation.internal.TestClock;
-import com.google.instrumentation.trace.Span.Options;
-import com.google.instrumentation.trace.SpanImpl.StartEndHandler;
-import com.google.instrumentation.trace.TraceConfig.TraceParams;
+import io.opencensus.internal.TestClock;
+import io.opencensus.trace.Span.Options;
+import io.opencensus.trace.SpanImpl.StartEndHandler;
+import io.opencensus.trace.TraceConfig.TraceParams;
 import java.util.Random;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/core_impl/src/test/java/com/google/instrumentation/trace/SpanImplTest.java b/core_impl/src/test/java/io/opencensus/trace/SpanImplTest.java
index 26742032..6c9d57fc 100644
--- a/core_impl/src/test/java/com/google/instrumentation/trace/SpanImplTest.java
+++ b/core_impl/src/test/java/io/opencensus/trace/SpanImplTest.java
@@ -11,16 +11,16 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.common.Duration;
-import com.google.instrumentation.common.Timestamp;
-import com.google.instrumentation.internal.TestClock;
-import com.google.instrumentation.trace.Span.Options;
-import com.google.instrumentation.trace.SpanImpl.StartEndHandler;
-import com.google.instrumentation.trace.TraceConfig.TraceParams;
+import io.opencensus.common.Duration;
+import io.opencensus.common.Timestamp;
+import io.opencensus.internal.TestClock;
+import io.opencensus.trace.Span.Options;
+import io.opencensus.trace.SpanImpl.StartEndHandler;
+import io.opencensus.trace.TraceConfig.TraceParams;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core_impl/src/test/java/com/google/instrumentation/trace/TimestampConverterTest.java b/core_impl/src/test/java/io/opencensus/trace/TimestampConverterTest.java
index b1e48631..e6f48a9f 100644
--- a/core_impl/src/test/java/com/google/instrumentation/trace/TimestampConverterTest.java
+++ b/core_impl/src/test/java/io/opencensus/trace/TimestampConverterTest.java
@@ -11,13 +11,13 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
-import com.google.instrumentation.common.Clock;
-import com.google.instrumentation.common.Timestamp;
+import io.opencensus.common.Clock;
+import io.opencensus.common.Timestamp;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/core_impl/src/test/java/com/google/instrumentation/trace/TraceComponentImplBaseTest.java b/core_impl/src/test/java/io/opencensus/trace/TraceComponentImplBaseTest.java
index 8f739d28..7bae0e54 100644
--- a/core_impl/src/test/java/com/google/instrumentation/trace/TraceComponentImplBaseTest.java
+++ b/core_impl/src/test/java/io/opencensus/trace/TraceComponentImplBaseTest.java
@@ -11,13 +11,13 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.common.MillisClock;
-import com.google.instrumentation.common.SimpleEventQueue;
-import com.google.instrumentation.trace.RandomHandler.SecureRandomHandler;
+import io.opencensus.common.MillisClock;
+import io.opencensus.common.SimpleEventQueue;
+import io.opencensus.trace.RandomHandler.SecureRandomHandler;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/core_impl/src/test/java/com/google/instrumentation/trace/TraceConfigImplTest.java b/core_impl/src/test/java/io/opencensus/trace/TraceConfigImplTest.java
index 1535f573..6e43cbb4 100644
--- a/core_impl/src/test/java/com/google/instrumentation/trace/TraceConfigImplTest.java
+++ b/core_impl/src/test/java/io/opencensus/trace/TraceConfigImplTest.java
@@ -11,11 +11,11 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.trace.TraceConfig.TraceParams;
+import io.opencensus.trace.TraceConfig.TraceParams;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/core_impl/src/test/java/com/google/instrumentation/trace/TraceExporterImplTest.java b/core_impl/src/test/java/io/opencensus/trace/TraceExporterImplTest.java
index 03f0e408..4684bef8 100644
--- a/core_impl/src/test/java/com/google/instrumentation/trace/TraceExporterImplTest.java
+++ b/core_impl/src/test/java/io/opencensus/trace/TraceExporterImplTest.java
@@ -11,17 +11,17 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.anyListOf;
 import static org.mockito.Mockito.doThrow;
 
-import com.google.instrumentation.common.MillisClock;
-import com.google.instrumentation.common.SimpleEventQueue;
-import com.google.instrumentation.trace.Span.Options;
-import com.google.instrumentation.trace.TraceConfig.TraceParams;
-import com.google.instrumentation.trace.TraceExporter.ServiceHandler;
+import io.opencensus.common.MillisClock;
+import io.opencensus.common.SimpleEventQueue;
+import io.opencensus.trace.Span.Options;
+import io.opencensus.trace.TraceConfig.TraceParams;
+import io.opencensus.trace.TraceExporter.ServiceHandler;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.EnumSet;
diff --git a/core_impl_android/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java b/core_impl_android/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java
index 998777bf..af0214d1 100644
--- a/core_impl_android/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java
+++ b/core_impl_android/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java
@@ -13,8 +13,8 @@
 
 package com.google.instrumentation.stats;
 
-import com.google.instrumentation.common.MillisClock;
-import com.google.instrumentation.common.SimpleEventQueue;
+import io.opencensus.common.MillisClock;
+import io.opencensus.common.SimpleEventQueue;
 
 /**
  * Android-compatible implementation of {@link StatsManager}.
diff --git a/core_impl_android/src/main/java/com/google/instrumentation/trace/TraceComponentImpl.java b/core_impl_android/src/main/java/io/opencensus/trace/TraceComponentImpl.java
index 07125900..b4e2e49e 100644
--- a/core_impl_android/src/main/java/com/google/instrumentation/trace/TraceComponentImpl.java
+++ b/core_impl_android/src/main/java/io/opencensus/trace/TraceComponentImpl.java
@@ -11,11 +11,11 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
-import com.google.instrumentation.common.MillisClock;
-import com.google.instrumentation.common.SimpleEventQueue;
-import com.google.instrumentation.trace.RandomHandler.SecureRandomHandler;
+import io.opencensus.common.MillisClock;
+import io.opencensus.common.SimpleEventQueue;
+import io.opencensus.trace.RandomHandler.SecureRandomHandler;
 
 /** Android-compatible implementation of the {@link TraceComponent}. */
 public final class TraceComponentImpl extends TraceComponentImplBase {
diff --git a/core_impl_android/src/test/java/com/google/instrumentation/trace/TraceComponentImplTest.java b/core_impl_android/src/test/java/io/opencensus/trace/TraceComponentImplTest.java
index a4f8b4f9..80580cc0 100644
--- a/core_impl_android/src/test/java/com/google/instrumentation/trace/TraceComponentImplTest.java
+++ b/core_impl_android/src/test/java/io/opencensus/trace/TraceComponentImplTest.java
@@ -11,11 +11,11 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.common.MillisClock;
+import io.opencensus.common.MillisClock;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/core_impl_java/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java b/core_impl_java/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java
index 1e0e8bda..53650a96 100644
--- a/core_impl_java/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java
+++ b/core_impl_java/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java
@@ -13,8 +13,8 @@
 
 package com.google.instrumentation.stats;
 
-import com.google.instrumentation.common.DisruptorEventQueue;
-import com.google.instrumentation.common.MillisClock;
+import io.opencensus.common.DisruptorEventQueue;
+import io.opencensus.common.MillisClock;
 
 /** Java 7 and 8 implementation of {@link StatsManager}. */
 public final class StatsManagerImpl extends StatsManagerImplBase {
diff --git a/core_impl_java/src/main/java/com/google/instrumentation/common/DisruptorEventQueue.java b/core_impl_java/src/main/java/io/opencensus/common/DisruptorEventQueue.java
index 1e54d283..4c9c0c62 100644
--- a/core_impl_java/src/main/java/com/google/instrumentation/common/DisruptorEventQueue.java
+++ b/core_impl_java/src/main/java/io/opencensus/common/DisruptorEventQueue.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.common;
+package io.opencensus.common;
 
 import com.lmax.disruptor.EventFactory;
 import com.lmax.disruptor.EventHandler;
diff --git a/core_impl_java/src/main/java/com/google/instrumentation/trace/ThreadLocalRandomHandler.java b/core_impl_java/src/main/java/io/opencensus/trace/ThreadLocalRandomHandler.java
index c467a897..156ae084 100644
--- a/core_impl_java/src/main/java/com/google/instrumentation/trace/ThreadLocalRandomHandler.java
+++ b/core_impl_java/src/main/java/io/opencensus/trace/ThreadLocalRandomHandler.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/core_impl_java/src/main/java/com/google/instrumentation/trace/TraceComponentImpl.java b/core_impl_java/src/main/java/io/opencensus/trace/TraceComponentImpl.java
index 3a2db7ca..4aecbbc6 100644
--- a/core_impl_java/src/main/java/com/google/instrumentation/trace/TraceComponentImpl.java
+++ b/core_impl_java/src/main/java/io/opencensus/trace/TraceComponentImpl.java
@@ -11,10 +11,10 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
-import com.google.instrumentation.common.DisruptorEventQueue;
-import com.google.instrumentation.common.MillisClock;
+import io.opencensus.common.DisruptorEventQueue;
+import io.opencensus.common.MillisClock;
 
 /** Java 7 and 8 implementation of the {@link TraceComponent}. */
 public final class TraceComponentImpl extends TraceComponentImplBase {
diff --git a/core_impl_java/src/test/java/com/google/instrumentation/common/DisruptorEventQueueTest.java b/core_impl_java/src/test/java/io/opencensus/common/DisruptorEventQueueTest.java
index c3ebe5ef..725b751d 100644
--- a/core_impl_java/src/test/java/com/google/instrumentation/common/DisruptorEventQueueTest.java
+++ b/core_impl_java/src/test/java/io/opencensus/common/DisruptorEventQueueTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.common;
+package io.opencensus.common;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/core_impl_java/src/test/java/com/google/instrumentation/trace/TracingTest.java b/core_impl_java/src/test/java/io/opencensus/trace/TracingTest.java
index ba550e73..1496d4d3 100644
--- a/core_impl_java/src/test/java/com/google/instrumentation/trace/TracingTest.java
+++ b/core_impl_java/src/test/java/io/opencensus/trace/TracingTest.java
@@ -11,11 +11,11 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package io.opencensus.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.common.MillisClock;
+import io.opencensus.common.MillisClock;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/examples/build.gradle b/examples/build.gradle
index 711f3bd8..aac3619e 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -24,21 +24,21 @@ task statsRunner(type: CreateStartScripts) {
 }
 
 task multiSpansTracing(type: CreateStartScripts) {
-    mainClassName = 'com.google.instrumentation.examples.trace.MultiSpansTracing'
+    mainClassName = 'io.opencensus.examples.trace.MultiSpansTracing'
     applicationName = 'MultiSpansTracing'
     outputDir = new File(project.buildDir, 'tmp')
     classpath = jar.outputs.files + project.configurations.runtime
 }
 
 task multiSpansScopedTracing(type: CreateStartScripts) {
-    mainClassName = 'com.google.instrumentation.examples.trace.MultiSpansScopedTracing'
+    mainClassName = 'io.opencensus.examples.trace.MultiSpansScopedTracing'
     applicationName = 'MultiSpansScopedTracing'
     outputDir = new File(project.buildDir, 'tmp')
     classpath = jar.outputs.files + project.configurations.runtime
 }
 
 task multiSpansContextTracing(type: CreateStartScripts) {
-    mainClassName = 'com.google.instrumentation.examples.trace.MultiSpansContextTracing'
+    mainClassName = 'io.opencensus.examples.trace.MultiSpansContextTracing'
     applicationName = 'MultiSpansContextTracing'
     outputDir = new File(project.buildDir, 'tmp')
     classpath = jar.outputs.files + project.configurations.runtime
diff --git a/examples/src/main/java/com/google/instrumentation/examples/stats/StatsRunner.java b/examples/src/main/java/com/google/instrumentation/examples/stats/StatsRunner.java
index a7e901df..831ce591 100644
--- a/examples/src/main/java/com/google/instrumentation/examples/stats/StatsRunner.java
+++ b/examples/src/main/java/com/google/instrumentation/examples/stats/StatsRunner.java
@@ -13,7 +13,6 @@
 
 package com.google.instrumentation.examples.stats;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
 import com.google.instrumentation.stats.MeasurementDescriptor;
 import com.google.instrumentation.stats.MeasurementDescriptor.BasicUnit;
 import com.google.instrumentation.stats.MeasurementDescriptor.MeasurementUnit;
@@ -23,6 +22,8 @@ import com.google.instrumentation.stats.StatsContext;
 import com.google.instrumentation.stats.StatsContextFactory;
 import com.google.instrumentation.stats.TagKey;
 import com.google.instrumentation.stats.TagValue;
+import io.opencensus.common.NonThrowingCloseable;
+
 import java.util.Arrays;
 
 /** Simple program that uses Stats contexts. */
diff --git a/examples/src/main/java/com/google/instrumentation/examples/trace/BasicContextTracing.java b/examples/src/main/java/com/google/instrumentation/examples/trace/BasicContextTracing.java
deleted file mode 100644
index 11a37dfe..00000000
--- a/examples/src/main/java/com/google/instrumentation/examples/trace/BasicContextTracing.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2017, Google Inc.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *     http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.instrumentation.examples.trace;
-
-import com.google.instrumentation.common.NonThrowingCloseable;
-import com.google.instrumentation.trace.Span;
-import com.google.instrumentation.trace.Tracer;
-import com.google.instrumentation.trace.Tracing;
-
-/**
- * Example showing how to create a {@link Span}, install it to the current context and add
- * annotations.
- */
-public final class BasicContextTracing {
-  // Per class Tracer.
-  private static final Tracer tracer = Tracing.getTracer();
-
-  private static void doWork() {
-    // Add an annotation to the current Span.
-    tracer.getCurrentSpan().addAnnotation("This is a doWork() annotation.");
-  }
-
-  /** Main method. */
-  public static void main(String[] args) {
-    Span span = tracer.spanBuilder("MyRootSpan").becomeRoot().startSpan();
-    try (NonThrowingCloseable ws = tracer.withSpan(span)) {
-      doWork();
-    }
-    span.end();
-  }
-}
diff --git a/examples/src/main/java/com/google/instrumentation/examples/trace/BasicScopedTracing.java b/examples/src/main/java/com/google/instrumentation/examples/trace/BasicScopedTracing.java
deleted file mode 100644
index 4eddf800..00000000
--- a/examples/src/main/java/com/google/instrumentation/examples/trace/BasicScopedTracing.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2017, Google Inc.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *     http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.instrumentation.examples.trace;
-
-import com.google.instrumentation.common.NonThrowingCloseable;
-import com.google.instrumentation.trace.Span;
-import com.google.instrumentation.trace.Tracer;
-import com.google.instrumentation.trace.Tracing;
-
-/**
- * Example showing how to create a {@link Span} using scoped Span, install it in the current
- * context, and add annotations.
- */
-public final class BasicScopedTracing {
-  // Per class Tracer.
-  private static final Tracer tracer = Tracing.getTracer();
-
-  private static void doWork() {
-    // Add an annotation to the current Span.
-    tracer.getCurrentSpan().addAnnotation("This is a doWork() annotation.");
-  }
-
-  /** Main method. */
-  public static void main(String[] args) {
-    try (NonThrowingCloseable ss =
-        tracer.spanBuilder("MyRootSpan").becomeRoot().startScopedSpan()) {
-      doWork();
-    }
-  }
-}
diff --git a/examples/src/main/java/com/google/instrumentation/examples/trace/BasicTracing.java b/examples/src/main/java/com/google/instrumentation/examples/trace/BasicTracing.java
deleted file mode 100644
index 1a78aebe..00000000
--- a/examples/src/main/java/com/google/instrumentation/examples/trace/BasicTracing.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017, Google Inc.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *     http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.instrumentation.examples.trace;
-
-import com.google.instrumentation.trace.Span;
-import com.google.instrumentation.trace.Tracer;
-import com.google.instrumentation.trace.Tracing;
-
-/** Example showing how to create a {@link Span} and add annotations. */
-public final class BasicTracing {
-  // Per class Tracer.
-  private static final Tracer tracer = Tracing.getTracer();
-
-  private static void doWork() {
-    Span span = tracer.spanBuilder(null, "MyRootSpan").startSpan();
-    span.addAnnotation("This annotation is added directly to the span.");
-    span.end();
-  }
-
-  /** Main method. */
-  public static void main(String[] args) {
-    doWork();
-  }
-}
diff --git a/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansContextTracing.java b/examples/src/main/java/io/opencensus/examples/trace/MultiSpansContextTracing.java
index c83b11d9..ef497d7e 100644
--- a/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansContextTracing.java
+++ b/examples/src/main/java/io/opencensus/examples/trace/MultiSpansContextTracing.java
@@ -11,13 +11,13 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.examples.trace;
+package io.opencensus.examples.trace;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
-import com.google.instrumentation.trace.Span;
-import com.google.instrumentation.trace.TraceExporter;
-import com.google.instrumentation.trace.Tracer;
-import com.google.instrumentation.trace.Tracing;
+import io.opencensus.common.NonThrowingCloseable;
+import io.opencensus.trace.Span;
+import io.opencensus.trace.TraceExporter;
+import io.opencensus.trace.Tracer;
+import io.opencensus.trace.Tracing;
 
 /**
  * Example showing how to create a child {@link Span}, install it to the current context and add
diff --git a/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansScopedTracing.java b/examples/src/main/java/io/opencensus/examples/trace/MultiSpansScopedTracing.java
index be7672d7..267fb639 100644
--- a/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansScopedTracing.java
+++ b/examples/src/main/java/io/opencensus/examples/trace/MultiSpansScopedTracing.java
@@ -11,13 +11,13 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.examples.trace;
+package io.opencensus.examples.trace;
 
-import com.google.instrumentation.common.NonThrowingCloseable;
-import com.google.instrumentation.trace.Span;
-import com.google.instrumentation.trace.TraceExporter;
-import com.google.instrumentation.trace.Tracer;
-import com.google.instrumentation.trace.Tracing;
+import io.opencensus.common.NonThrowingCloseable;
+import io.opencensus.trace.Span;
+import io.opencensus.trace.TraceExporter;
+import io.opencensus.trace.Tracer;
+import io.opencensus.trace.Tracing;
 
 /**
  * Example showing how to create a child {@link Span} using scoped Spans, install it in the current
diff --git a/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansTracing.java b/examples/src/main/java/io/opencensus/examples/trace/MultiSpansTracing.java
index 5268a797..036d3684 100644
--- a/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansTracing.java
+++ b/examples/src/main/java/io/opencensus/examples/trace/MultiSpansTracing.java
@@ -11,12 +11,12 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.examples.trace;
+package io.opencensus.examples.trace;
 
-import com.google.instrumentation.trace.Span;
-import com.google.instrumentation.trace.TraceExporter;
-import com.google.instrumentation.trace.Tracer;
-import com.google.instrumentation.trace.Tracing;
+import io.opencensus.trace.Span;
+import io.opencensus.trace.TraceExporter;
+import io.opencensus.trace.Tracer;
+import io.opencensus.trace.Tracing;
 
 /** Example showing how to directly create a child {@link Span} and add annotations. */
 public final class MultiSpansTracing {
diff --git a/settings.gradle b/settings.gradle
index e7881b0f..ade14ea5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,14 @@
 rootProject.name = "instrumentation-java"
+
+include ":opencensus-api"
 include ":all"
 include ":core"
 include ":core_impl"
 include ":core_impl_java"
 include ":core_impl_android"
 
+project(':opencensus-api').projectDir = "$rootDir/api" as File
+
 // Java8 projects only
 if (JavaVersion.current().isJava8Compatible()) {
     include ":examples"