diff --git a/tremor-script/lib/cncf.tremor b/tremor-script/lib/cncf.tremor
index ac780c02a1..c2a4967849 100644
--- a/tremor-script/lib/cncf.tremor
+++ b/tremor-script/lib/cncf.tremor
@@ -8,7 +8,7 @@
 ###
 ### It provides the following modules for cloud native computing:
 ###
-### * [otel](cncf/otel.md) - functionality related to `CNCF OpenTelemetry`
+### * [otel](otel/index.md) - functionality related to `CNCF OpenTelemetry`
 ###
 
 use cncf::otel;
diff --git a/tremor-script/lib/cncf/otel.tremor b/tremor-script/lib/cncf/otel.tremor
index faee3d4e75..cc66ca4944 100644
--- a/tremor-script/lib/cncf/otel.tremor
+++ b/tremor-script/lib/cncf/otel.tremor
@@ -10,9 +10,9 @@
 ###
 ### * [span_id](span_id.md) - OpenTelemetry Span Id utilities
 ### * [trace_id](trace_id.md) - OpenTelemetry Trace Id utilities
-### * [logs](logs.md) - OpenTelemetry log event utilities
-### * [metrics](metrics.md) - OpenTelemetry metrics event utilities
-### * [trace](trace.md) - OpenTelemetry trace event utilities
+### * [logs](logs/index.md) - OpenTelemetry log event utilities
+### * [metrics](metrics/index.md) - OpenTelemetry metrics event utilities
+### * [trace](trace/index.md) - OpenTelemetry trace event utilities
 
 use cncf::otel::span_id;
 use cncf::otel::trace_id;
diff --git a/tremor-script/lib/cncf/otel/logs.tremor b/tremor-script/lib/cncf/otel/logs.tremor
index a53214989a..2f97f2c6d4 100644
--- a/tremor-script/lib/cncf/otel/logs.tremor
+++ b/tremor-script/lib/cncf/otel/logs.tremor
@@ -1,7 +1,7 @@
 ### CNCF OpenTelemetry Log event utilities
 ###
-### * [severity](logs/severity.md) - Log severity
-### * [traceflags](logs/traceflags.md) - Log trace flags
+### * [severity](severity.md) - Log severity
+### * [traceflags](traceflags.md) - Log trace flags
 
 use cncf::otel::logs::severity;
 use cncf::otel::logs::traceflags;
diff --git a/tremor-script/lib/cncf/otel/metrics.tremor b/tremor-script/lib/cncf/otel/metrics.tremor
index 1764710af9..f03e23c895 100644
--- a/tremor-script/lib/cncf/otel/metrics.tremor
+++ b/tremor-script/lib/cncf/otel/metrics.tremor
@@ -1,5 +1,5 @@
 ### CNCF OpenTelemetry Metrics event utilities
 ###
-### * [temporality](metrics/temporality.md) - Metrics aggregation temporality
+### * [temporality](temporality.md) - Metrics aggregation temporality
 
 use cncf::otel::metrics::temporality;
diff --git a/tremor-script/lib/cncf/otel/trace.tremor b/tremor-script/lib/cncf/otel/trace.tremor
index 95ff457024..795b48d056 100644
--- a/tremor-script/lib/cncf/otel/trace.tremor
+++ b/tremor-script/lib/cncf/otel/trace.tremor
@@ -1,7 +1,7 @@
 ### CNCF OpenTelemetry Trace event utilities
 ###
 ### * [spankind](spankind.md) - Trace span kind
-### * [status](status.md) - Trace status
+### * [status](status/index.md) - Trace status
 
 use cncf::otel::trace::spankind;
 use cncf::otel::trace::status;
diff --git a/tremor-script/lib/std.tremor b/tremor-script/lib/std.tremor
index 881031b77f..1b545548ad 100644
--- a/tremor-script/lib/std.tremor
+++ b/tremor-script/lib/std.tremor
@@ -4,7 +4,7 @@
 ### * [base64](base64.md) - functions for base64 en and decoding
 ### * [binary](base64.md) - functions to deal with binary data (`<< 1, 2, 3 >>`)
 ### * [float](float.md) - functions to deal with floating point numbers
-### * [integer](integer.md) - functions to deal with integer numbers
+### * [integer](integer/index.md) - functions to deal with integer numbers
 ### * [json](json.md) - functions to deal with JSON
 ### * [math](math.md) - mathematical functions
 ### * [path](path.md) - path utility functions
@@ -14,6 +14,7 @@
 ### * [record](record.md) - functions dealing with records (`{}`)
 ### * [string](string.md) - functions dealing with strings
 ### * [test](test.md) - test related functions
+### * [time](time/index.md) - time related functions
 ### * [type](type.md) - functions dealing with strings
 ### * [url](url.md) - url decoding/encoding functions
 ### * [size](size.md) - functions for converting size units