diff --git a/packages/opentelemetry-core/src/context/propagation/types.ts b/packages/opentelemetry-core/src/context/propagation/types.ts
deleted file mode 100644
index e973c7790b..0000000000
--- a/packages/opentelemetry-core/src/context/propagation/types.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- *
- * 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
- *
- *      https://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.
- */
-
-import { TextMapPropagator } from '@opentelemetry/api';
-
-/** Configuration object for composite propagator */
-export interface CompositePropagatorConfig {
-  /**
-   * List of propagators to run. Propagators run in the
-   * list order. If a propagator later in the list writes the same context
-   * key as a propagator earlier in the list, the later on will "win".
-   */
-  propagators?: TextMapPropagator[];
-}
diff --git a/packages/opentelemetry-core/src/index.ts b/packages/opentelemetry-core/src/index.ts
index 871f02dc85..8fe415e2eb 100644
--- a/packages/opentelemetry-core/src/index.ts
+++ b/packages/opentelemetry-core/src/index.ts
@@ -14,24 +14,23 @@
  * limitations under the License.
  */
 
+export * from './baggage/propagation/HttpBaggage';
 export * from './common/attributes';
 export * from './common/global-error-handler';
 export * from './common/logging-error-handler';
 export * from './common/time';
 export * from './common/types';
 export * from './ExportResult';
-export * from './version';
-export * from './context/propagation/composite';
-export * from './context/propagation/HttpTraceContext';
-export * from './context/propagation/types';
-export * from './baggage/propagation/HttpBaggage';
 export * from './platform';
+export * from './propagation/composite';
+export * from './trace/HttpTraceContext';
+export * from './trace/IdGenerator';
 export * from './trace/sampler/AlwaysOffSampler';
 export * from './trace/sampler/AlwaysOnSampler';
 export * from './trace/sampler/ParentBasedSampler';
 export * from './trace/sampler/TraceIdRatioBasedSampler';
 export * from './trace/TraceState';
-export * from './trace/IdGenerator';
+export * from './utils/sampling';
 export * from './utils/url';
 export * from './utils/wrap';
-export * from './utils/sampling';
+export * from './version';
diff --git a/packages/opentelemetry-core/src/context/propagation/composite.ts b/packages/opentelemetry-core/src/propagation/composite.ts
similarity index 89%
rename from packages/opentelemetry-core/src/context/propagation/composite.ts
rename to packages/opentelemetry-core/src/propagation/composite.ts
index 507b407f24..3a02890bed 100644
--- a/packages/opentelemetry-core/src/context/propagation/composite.ts
+++ b/packages/opentelemetry-core/src/propagation/composite.ts
@@ -21,7 +21,16 @@ import {
   diag,
   TextMapSetter,
 } from '@opentelemetry/api';
-import { CompositePropagatorConfig } from './types';
+
+/** Configuration object for composite propagator */
+export interface CompositePropagatorConfig {
+  /**
+   * List of propagators to run. Propagators run in the
+   * list order. If a propagator later in the list writes the same context
+   * key as a propagator earlier in the list, the later on will "win".
+   */
+  propagators?: TextMapPropagator[];
+}
 
 /** Combines multiple propagators into a single propagator. */
 export class CompositePropagator implements TextMapPropagator {
diff --git a/packages/opentelemetry-core/src/context/propagation/HttpTraceContext.ts b/packages/opentelemetry-core/src/trace/HttpTraceContext.ts
similarity index 98%
rename from packages/opentelemetry-core/src/context/propagation/HttpTraceContext.ts
rename to packages/opentelemetry-core/src/trace/HttpTraceContext.ts
index d40b447798..b68b0e25bc 100644
--- a/packages/opentelemetry-core/src/context/propagation/HttpTraceContext.ts
+++ b/packages/opentelemetry-core/src/trace/HttpTraceContext.ts
@@ -26,7 +26,7 @@ import {
   TextMapSetter,
   TraceFlags,
 } from '@opentelemetry/api';
-import { TraceState } from '../../trace/TraceState';
+import { TraceState } from './TraceState';
 
 export const TRACE_PARENT_HEADER = 'traceparent';
 export const TRACE_STATE_HEADER = 'tracestate';
diff --git a/packages/opentelemetry-core/test/context/composite.test.ts b/packages/opentelemetry-core/test/propagation/composite.test.ts
similarity index 99%
rename from packages/opentelemetry-core/test/context/composite.test.ts
rename to packages/opentelemetry-core/test/propagation/composite.test.ts
index 6addee1ff2..a29d0fc70f 100644
--- a/packages/opentelemetry-core/test/context/composite.test.ts
+++ b/packages/opentelemetry-core/test/propagation/composite.test.ts
@@ -39,7 +39,7 @@ import {
 import {
   TRACE_PARENT_HEADER,
   TRACE_STATE_HEADER,
-} from '../../src/context/propagation/HttpTraceContext';
+} from '../../src/trace/HttpTraceContext';
 import { TraceState } from '../../src/trace/TraceState';
 
 describe('Composite Propagator', () => {
diff --git a/packages/opentelemetry-core/test/context/HttpTraceContext.test.ts b/packages/opentelemetry-core/test/trace/HttpTraceContext.test.ts
similarity index 99%
rename from packages/opentelemetry-core/test/context/HttpTraceContext.test.ts
rename to packages/opentelemetry-core/test/trace/HttpTraceContext.test.ts
index ca2bfabb7a..104dbd4ff7 100644
--- a/packages/opentelemetry-core/test/context/HttpTraceContext.test.ts
+++ b/packages/opentelemetry-core/test/trace/HttpTraceContext.test.ts
@@ -31,7 +31,7 @@ import {
   HttpTraceContext,
   TRACE_PARENT_HEADER,
   TRACE_STATE_HEADER,
-} from '../../src/context/propagation/HttpTraceContext';
+} from '../../src/trace/HttpTraceContext';
 import { TraceState } from '../../src/trace/TraceState';
 
 describe('HttpTraceContext', () => {