diff --git a/api/src/main/java/openconsensus/common/Function.java b/api/src/main/java/openconsensus/common/Function.java
index 3d6133bcd0..4baf751ba9 100644
--- a/api/src/main/java/openconsensus/common/Function.java
+++ b/api/src/main/java/openconsensus/common/Function.java
@@ -16,7 +16,7 @@
 
 package openconsensus.common;
 
-import openconsensus.trace.AttributeValue;
+import openconsensus.trace.data.AttributeValue;
 
 /**
  * Used to specify matching functions for use encoding tagged unions (i.e. sum types) in Java. See
diff --git a/api/src/main/java/openconsensus/trace/BlankSpan.java b/api/src/main/java/openconsensus/trace/BlankSpan.java
index 0cab48dcb6..78524fc2c2 100644
--- a/api/src/main/java/openconsensus/trace/BlankSpan.java
+++ b/api/src/main/java/openconsensus/trace/BlankSpan.java
@@ -19,6 +19,11 @@ package openconsensus.trace;
 import java.util.Map;
 import javax.annotation.concurrent.Immutable;
 import openconsensus.internal.Utils;
+import openconsensus.trace.data.Annotation;
+import openconsensus.trace.data.AttributeValue;
+import openconsensus.trace.data.Link;
+import openconsensus.trace.data.MessageEvent;
+import openconsensus.trace.data.Status;
 
 /**
  * The {@code BlankSpan} is a singleton class, which is the default {@link Span} that is used when
diff --git a/api/src/main/java/openconsensus/trace/CurrentSpanUtils.java b/api/src/main/java/openconsensus/trace/CurrentSpanUtils.java
index 09b12e3e56..e8e933d55a 100644
--- a/api/src/main/java/openconsensus/trace/CurrentSpanUtils.java
+++ b/api/src/main/java/openconsensus/trace/CurrentSpanUtils.java
@@ -20,6 +20,7 @@ import io.grpc.Context;
 import java.util.concurrent.Callable;
 import javax.annotation.Nullable;
 import openconsensus.common.Scope;
+import openconsensus.trace.data.Status;
 import openconsensus.trace.unsafe.ContextUtils;
 
 /** Util methods/functionality to interact with the {@link Span} in the {@link io.grpc.Context}. */
diff --git a/api/src/main/java/openconsensus/trace/EndSpanOptions.java b/api/src/main/java/openconsensus/trace/EndSpanOptions.java
index da8acdc5dd..b9bbc4525d 100644
--- a/api/src/main/java/openconsensus/trace/EndSpanOptions.java
+++ b/api/src/main/java/openconsensus/trace/EndSpanOptions.java
@@ -19,6 +19,7 @@ package openconsensus.trace;
 import com.google.auto.value.AutoValue;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
+import openconsensus.trace.data.Status;
 
 /**
  * A class that enables overriding the default values used when ending a {@link Span}. Allows
diff --git a/api/src/main/java/openconsensus/trace/Sampler.java b/api/src/main/java/openconsensus/trace/Sampler.java
index 23facc2864..14af40969c 100644
--- a/api/src/main/java/openconsensus/trace/Sampler.java
+++ b/api/src/main/java/openconsensus/trace/Sampler.java
@@ -18,6 +18,8 @@ package openconsensus.trace;
 
 import java.util.List;
 import javax.annotation.Nullable;
+import openconsensus.trace.data.SpanId;
+import openconsensus.trace.data.TraceId;
 
 /**
  * Sampler is used to make decisions on {@link Span} sampling.
diff --git a/api/src/main/java/openconsensus/trace/Span.java b/api/src/main/java/openconsensus/trace/Span.java
index 8c1e2d5e09..695a761b50 100644
--- a/api/src/main/java/openconsensus/trace/Span.java
+++ b/api/src/main/java/openconsensus/trace/Span.java
@@ -22,6 +22,11 @@ import java.util.Map;
 import java.util.Set;
 import javax.annotation.Nullable;
 import openconsensus.internal.Utils;
+import openconsensus.trace.data.Annotation;
+import openconsensus.trace.data.AttributeValue;
+import openconsensus.trace.data.Link;
+import openconsensus.trace.data.MessageEvent;
+import openconsensus.trace.data.Status;
 
 /**
  * An abstract class that represents a span. It has an associated {@link SpanContext} and a set of
diff --git a/api/src/main/java/openconsensus/trace/SpanBuilder.java b/api/src/main/java/openconsensus/trace/SpanBuilder.java
index ca57bc5a62..86335cf3d3 100644
--- a/api/src/main/java/openconsensus/trace/SpanBuilder.java
+++ b/api/src/main/java/openconsensus/trace/SpanBuilder.java
@@ -22,6 +22,7 @@ import java.util.concurrent.Callable;
 import javax.annotation.Nullable;
 import openconsensus.common.Scope;
 import openconsensus.internal.Utils;
+import openconsensus.trace.data.Status;
 
 /**
  * {@link SpanBuilder} is used to construct {@link Span} instances which define arbitrary scopes of
diff --git a/api/src/main/java/openconsensus/trace/SpanContext.java b/api/src/main/java/openconsensus/trace/SpanContext.java
index 03919cadb8..4e50efa96d 100644
--- a/api/src/main/java/openconsensus/trace/SpanContext.java
+++ b/api/src/main/java/openconsensus/trace/SpanContext.java
@@ -19,6 +19,10 @@ package openconsensus.trace;
 import java.util.Arrays;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
+import openconsensus.trace.data.SpanId;
+import openconsensus.trace.data.TraceId;
+import openconsensus.trace.data.TraceOptions;
+import openconsensus.trace.data.Tracestate;
 
 /**
  * A class that represents a span context. A span context contains the state that must propagate to
diff --git a/api/src/main/java/openconsensus/trace/Tracer.java b/api/src/main/java/openconsensus/trace/Tracer.java
index 0f008b35a2..f9ddd144b3 100644
--- a/api/src/main/java/openconsensus/trace/Tracer.java
+++ b/api/src/main/java/openconsensus/trace/Tracer.java
@@ -22,6 +22,7 @@ import javax.annotation.Nullable;
 import openconsensus.common.Scope;
 import openconsensus.internal.Utils;
 import openconsensus.trace.SpanBuilder.NoopSpanBuilder;
+import openconsensus.trace.data.Status;
 
 /**
  * Tracer is a simple, thin class for {@link Span} creation and in-process context interaction.
diff --git a/api/src/main/java/openconsensus/trace/Annotation.java b/api/src/main/java/openconsensus/trace/data/Annotation.java
similarity index 98%
rename from api/src/main/java/openconsensus/trace/Annotation.java
rename to api/src/main/java/openconsensus/trace/data/Annotation.java
index 6d7fac1861..f58033978b 100644
--- a/api/src/main/java/openconsensus/trace/Annotation.java
+++ b/api/src/main/java/openconsensus/trace/data/Annotation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package openconsensus.trace;
+package openconsensus.trace.data;
 
 import com.google.auto.value.AutoValue;
 import java.util.Collections;
diff --git a/api/src/main/java/openconsensus/trace/AttributeValue.java b/api/src/main/java/openconsensus/trace/data/AttributeValue.java
similarity index 99%
rename from api/src/main/java/openconsensus/trace/AttributeValue.java
rename to api/src/main/java/openconsensus/trace/data/AttributeValue.java
index 09f7c714f3..a64d2925a8 100644
--- a/api/src/main/java/openconsensus/trace/AttributeValue.java
+++ b/api/src/main/java/openconsensus/trace/data/AttributeValue.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package openconsensus.trace;
+package openconsensus.trace.data;
 
 import com.google.auto.value.AutoValue;
 import javax.annotation.concurrent.Immutable;
diff --git a/api/src/main/java/openconsensus/trace/BigendianEncoding.java b/api/src/main/java/openconsensus/trace/data/BigendianEncoding.java
similarity index 99%
rename from api/src/main/java/openconsensus/trace/BigendianEncoding.java
rename to api/src/main/java/openconsensus/trace/data/BigendianEncoding.java
index b95bc866ca..dc2ea4ebfa 100644
--- a/api/src/main/java/openconsensus/trace/BigendianEncoding.java
+++ b/api/src/main/java/openconsensus/trace/data/BigendianEncoding.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package openconsensus.trace;
+package openconsensus.trace.data;
 
 import java.util.Arrays;
 import openconsensus.internal.Utils;
diff --git a/api/src/main/java/openconsensus/trace/Link.java b/api/src/main/java/openconsensus/trace/data/Link.java
similarity index 96%
rename from api/src/main/java/openconsensus/trace/Link.java
rename to api/src/main/java/openconsensus/trace/data/Link.java
index 5eac22376f..403786060f 100644
--- a/api/src/main/java/openconsensus/trace/Link.java
+++ b/api/src/main/java/openconsensus/trace/data/Link.java
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package openconsensus.trace;
+package openconsensus.trace.data;
 
 import com.google.auto.value.AutoValue;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.concurrent.Immutable;
+import openconsensus.trace.Span;
+import openconsensus.trace.SpanContext;
 
 /**
  * A link to a {@link Span} from a different trace.
diff --git a/api/src/main/java/openconsensus/trace/MessageEvent.java b/api/src/main/java/openconsensus/trace/data/MessageEvent.java
similarity index 99%
rename from api/src/main/java/openconsensus/trace/MessageEvent.java
rename to api/src/main/java/openconsensus/trace/data/MessageEvent.java
index d70284d3f8..364fe14ac7 100644
--- a/api/src/main/java/openconsensus/trace/MessageEvent.java
+++ b/api/src/main/java/openconsensus/trace/data/MessageEvent.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package openconsensus.trace;
+package openconsensus.trace.data;
 
 import com.google.auto.value.AutoValue;
 import javax.annotation.concurrent.Immutable;
diff --git a/api/src/main/java/openconsensus/trace/SpanId.java b/api/src/main/java/openconsensus/trace/data/SpanId.java
similarity index 99%
rename from api/src/main/java/openconsensus/trace/SpanId.java
rename to api/src/main/java/openconsensus/trace/data/SpanId.java
index 1467114e66..794ebacd3e 100644
--- a/api/src/main/java/openconsensus/trace/SpanId.java
+++ b/api/src/main/java/openconsensus/trace/data/SpanId.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package openconsensus.trace;
+package openconsensus.trace.data;
 
 import java.util.Random;
 import javax.annotation.Nullable;
diff --git a/api/src/main/java/openconsensus/trace/Status.java b/api/src/main/java/openconsensus/trace/data/Status.java
similarity index 99%
rename from api/src/main/java/openconsensus/trace/Status.java
rename to api/src/main/java/openconsensus/trace/data/Status.java
index 428633c9cb..1302c2d422 100644
--- a/api/src/main/java/openconsensus/trace/Status.java
+++ b/api/src/main/java/openconsensus/trace/data/Status.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package openconsensus.trace;
+package openconsensus.trace.data;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -24,6 +24,7 @@ import java.util.TreeMap;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import openconsensus.internal.Utils;
+import openconsensus.trace.Span;
 
 /*>>>
 import org.checkerframework.dataflow.qual.Deterministic;
diff --git a/api/src/main/java/openconsensus/trace/TraceId.java b/api/src/main/java/openconsensus/trace/data/TraceId.java
similarity index 99%
rename from api/src/main/java/openconsensus/trace/TraceId.java
rename to api/src/main/java/openconsensus/trace/data/TraceId.java
index 8616489993..a0f3759ecb 100644
--- a/api/src/main/java/openconsensus/trace/TraceId.java
+++ b/api/src/main/java/openconsensus/trace/data/TraceId.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package openconsensus.trace;
+package openconsensus.trace.data;
 
 import java.util.Random;
 import javax.annotation.Nullable;
diff --git a/api/src/main/java/openconsensus/trace/TraceOptions.java b/api/src/main/java/openconsensus/trace/data/TraceOptions.java
similarity index 99%
rename from api/src/main/java/openconsensus/trace/TraceOptions.java
rename to api/src/main/java/openconsensus/trace/data/TraceOptions.java
index 5cdc91912e..b09642c1e0 100644
--- a/api/src/main/java/openconsensus/trace/TraceOptions.java
+++ b/api/src/main/java/openconsensus/trace/data/TraceOptions.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package openconsensus.trace;
+package openconsensus.trace.data;
 
 import java.util.Arrays;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import openconsensus.internal.DefaultVisibilityForTesting;
 import openconsensus.internal.Utils;
+import openconsensus.trace.Span;
 
 /**
  * A class that represents global trace options. These options are propagated to all child {@link
diff --git a/api/src/main/java/openconsensus/trace/Tracestate.java b/api/src/main/java/openconsensus/trace/data/Tracestate.java
similarity index 99%
rename from api/src/main/java/openconsensus/trace/Tracestate.java
rename to api/src/main/java/openconsensus/trace/data/Tracestate.java
index 410817e84a..8a5ee09a50 100644
--- a/api/src/main/java/openconsensus/trace/Tracestate.java
+++ b/api/src/main/java/openconsensus/trace/data/Tracestate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package openconsensus.trace;
+package openconsensus.trace.data;
 
 import com.google.auto.value.AutoValue;
 import java.util.ArrayList;
diff --git a/api/src/main/java/openconsensus/trace/samplers/AlwaysSampleSampler.java b/api/src/main/java/openconsensus/trace/samplers/AlwaysSampleSampler.java
index bc03cf82ab..ac1c46931b 100644
--- a/api/src/main/java/openconsensus/trace/samplers/AlwaysSampleSampler.java
+++ b/api/src/main/java/openconsensus/trace/samplers/AlwaysSampleSampler.java
@@ -22,8 +22,8 @@ import javax.annotation.concurrent.Immutable;
 import openconsensus.trace.Sampler;
 import openconsensus.trace.Span;
 import openconsensus.trace.SpanContext;
-import openconsensus.trace.SpanId;
-import openconsensus.trace.TraceId;
+import openconsensus.trace.data.SpanId;
+import openconsensus.trace.data.TraceId;
 
 /** Sampler that always makes a "yes" decision on {@link Span} sampling. */
 @Immutable
diff --git a/api/src/main/java/openconsensus/trace/samplers/NeverSampleSampler.java b/api/src/main/java/openconsensus/trace/samplers/NeverSampleSampler.java
index 2e7147bf50..f466533fbd 100644
--- a/api/src/main/java/openconsensus/trace/samplers/NeverSampleSampler.java
+++ b/api/src/main/java/openconsensus/trace/samplers/NeverSampleSampler.java
@@ -22,8 +22,8 @@ import javax.annotation.concurrent.Immutable;
 import openconsensus.trace.Sampler;
 import openconsensus.trace.Span;
 import openconsensus.trace.SpanContext;
-import openconsensus.trace.SpanId;
-import openconsensus.trace.TraceId;
+import openconsensus.trace.data.SpanId;
+import openconsensus.trace.data.TraceId;
 
 /** Sampler that always makes a "no" decision on {@link Span} sampling. */
 @Immutable
diff --git a/api/src/main/java/openconsensus/trace/samplers/ProbabilitySampler.java b/api/src/main/java/openconsensus/trace/samplers/ProbabilitySampler.java
index 275d72b51a..9d2e13210e 100644
--- a/api/src/main/java/openconsensus/trace/samplers/ProbabilitySampler.java
+++ b/api/src/main/java/openconsensus/trace/samplers/ProbabilitySampler.java
@@ -24,8 +24,8 @@ import openconsensus.internal.Utils;
 import openconsensus.trace.Sampler;
 import openconsensus.trace.Span;
 import openconsensus.trace.SpanContext;
-import openconsensus.trace.SpanId;
-import openconsensus.trace.TraceId;
+import openconsensus.trace.data.SpanId;
+import openconsensus.trace.data.TraceId;
 
 /**
  * We assume the lower 64 bits of the traceId's are randomly distributed around the whole (long)