diff --git a/text/0007-no-out-of-band-reporting.md b/text/0007-no-out-of-band-reporting.md
index 286b86e19..0addd963e 100644
--- a/text/0007-no-out-of-band-reporting.md
+++ b/text/0007-no-out-of-band-reporting.md
@@ -30,7 +30,7 @@ Here is a list of decisions and trade-offs related to supporting out-of-band rep
    * Example in the create metric we need to allow users to specify the resource, see
    [here][create-metric]. The developer that writes the instrumentation has no knowledge about where
    the monitored resource is deployed so there is no way to configure the right resource.
-2. [RFC](./0002-remove-spandata.md) removes support to report SpanData.
+2. [RFC](./trace/0002-remove-spandata.md) removes support to report SpanData.
    * This will require that the trace API has to support all the possible fields to be configured
    via the API, for example need to allow users to set a pre-generated `SpanId` that can be avoided
    if we do not support out-of-band reporting.
diff --git a/text/0091-logs-vocabulary.md b/text/logs/0091-logs-vocabulary.md
similarity index 100%
rename from text/0091-logs-vocabulary.md
rename to text/logs/0091-logs-vocabulary.md
diff --git a/text/0092-logs-vision.md b/text/logs/0092-logs-vision.md
similarity index 100%
rename from text/0092-logs-vision.md
rename to text/logs/0092-logs-vision.md
diff --git a/text/0003-measure-metric-type.md b/text/metrics/0003-measure-metric-type.md
similarity index 100%
rename from text/0003-measure-metric-type.md
rename to text/metrics/0003-measure-metric-type.md
diff --git a/text/0008-metric-observer.md b/text/metrics/0008-metric-observer.md
similarity index 100%
rename from text/0008-metric-observer.md
rename to text/metrics/0008-metric-observer.md
diff --git a/text/0009-metric-handles.md b/text/metrics/0009-metric-handles.md
similarity index 100%
rename from text/0009-metric-handles.md
rename to text/metrics/0009-metric-handles.md
diff --git a/text/0010-cumulative-to-counter.md b/text/metrics/0010-cumulative-to-counter.md
similarity index 100%
rename from text/0010-cumulative-to-counter.md
rename to text/metrics/0010-cumulative-to-counter.md
diff --git a/text/0049-metric-label-set.md b/text/metrics/0049-metric-label-set.md
similarity index 100%
rename from text/0049-metric-label-set.md
rename to text/metrics/0049-metric-label-set.md
diff --git a/text/0059-otlp-trace-data-format.md b/text/metrics/0059-otlp-trace-data-format.md
similarity index 100%
rename from text/0059-otlp-trace-data-format.md
rename to text/metrics/0059-otlp-trace-data-format.md
diff --git a/text/0070-metric-bound-instrument.md b/text/metrics/0070-metric-bound-instrument.md
similarity index 100%
rename from text/0070-metric-bound-instrument.md
rename to text/metrics/0070-metric-bound-instrument.md
diff --git a/text/0072-metric-observer.md b/text/metrics/0072-metric-observer.md
similarity index 100%
rename from text/0072-metric-observer.md
rename to text/metrics/0072-metric-observer.md
diff --git a/text/0080-remove-metric-gauge.md b/text/metrics/0080-remove-metric-gauge.md
similarity index 100%
rename from text/0080-remove-metric-gauge.md
rename to text/metrics/0080-remove-metric-gauge.md
diff --git a/text/0088-metric-instrument-optional-refinements.md b/text/metrics/0088-metric-instrument-optional-refinements.md
similarity index 100%
rename from text/0088-metric-instrument-optional-refinements.md
rename to text/metrics/0088-metric-instrument-optional-refinements.md
diff --git a/text/0090-remove-labelset-from-metrics-api.md b/text/metrics/0090-remove-labelset-from-metrics-api.md
similarity index 100%
rename from text/0090-remove-labelset-from-metrics-api.md
rename to text/metrics/0090-remove-labelset-from-metrics-api.md
diff --git a/text/0002-remove-spandata.md b/text/trace/0002-remove-spandata.md
similarity index 100%
rename from text/0002-remove-spandata.md
rename to text/trace/0002-remove-spandata.md
diff --git a/text/0006-sampling.md b/text/trace/0006-sampling.md
similarity index 100%
rename from text/0006-sampling.md
rename to text/trace/0006-sampling.md