diff --git a/src/emu/emu_stream.c b/src/emu/emu_stream.c
new file mode 100644
index 0000000..9ea0b05
--- /dev/null
+++ b/src/emu/emu_stream.c
@@ -0,0 +1,132 @@
+/* Copyright (c) 2021-2023 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
+
+#include "emu_stream.h"
+
+#include "ovni.h"
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+static int
+check_stream_header(struct emu_stream *stream)
+{
+	int ret = 0;
+
+	if (stream->size < sizeof(struct ovni_stream_header)) {
+		err("stream '%s': incomplete stream header\n",
+				stream->path);
+		return -1;
+	}
+
+	struct ovni_stream_header *h =
+			(struct ovni_stream_header *) stream->buf;
+
+	if (memcmp(h->magic, OVNI_STREAM_MAGIC, 4) != 0) {
+		char magic[5];
+		memcpy(magic, h->magic, 4);
+		magic[4] = '\0';
+		err("stream '%s': wrong stream magic '%s' (expected '%s')\n",
+				stream->path, magic, OVNI_STREAM_MAGIC);
+		ret = -1;
+	}
+
+	if (h->version != OVNI_STREAM_VERSION) {
+		err("stream '%s': stream version mismatch %u (expected %u)\n",
+				stream->path, h->version, OVNI_STREAM_VERSION);
+		ret = -1;
+	}
+
+	return ret;
+}
+
+static int
+load_stream_fd(struct emu_stream *stream, int fd)
+{
+	struct stat st;
+	if (fstat(fd, &st) < 0) {
+		perror("fstat failed");
+		return -1;
+	}
+
+	/* Error because it doesn't have the header */
+	if (st.st_size == 0) {
+		err("load_stream_fd: stream %s is empty\n", stream->path);
+		return -1;
+	}
+
+	int prot = PROT_READ | PROT_WRITE;
+	stream->buf = mmap(NULL, st.st_size, prot, MAP_PRIVATE, fd, 0);
+
+	if (stream->buf == MAP_FAILED) {
+		perror("mmap failed");
+		return -1;
+	}
+
+	stream->size = st.st_size;
+
+	return 0;
+}
+
+int
+emu_stream_load(struct emu_stream *stream, const char *tracedir, const char *relpath)
+{
+	int fd;
+
+	if (snprintf(stream->path, PATH_MAX, "%s/%s", tracedir, relpath) >= PATH_MAX) {
+		err("emu_stream_load: path too long: %s/%s\n", tracedir, relpath);
+		return -1;
+	}
+
+	if (snprintf(stream->relpath, PATH_MAX, "%s", relpath) >= PATH_MAX) {
+		err("emu_stream_load: path too long: %s\n", relpath);
+		return -1;
+	}
+
+	err("emu_stream_load: loading %s\n", stream->relpath);
+
+	if ((fd = open(stream->path, O_RDWR)) == -1) {
+		err("emu_stream_load: open failed: %s\n", stream->path);
+		return -1;
+	}
+
+	if (load_stream_fd(stream, fd) != 0) {
+		err("emu_stream_load: load_stream_fd failed for stream '%s'\n",
+				stream->path);
+		return -1;
+	}
+
+	if (check_stream_header(stream) != 0) {
+		err("emu_stream_load: stream '%s' has bad header\n",
+				stream->path);
+		return -1;
+	}
+
+	stream->offset = sizeof(struct ovni_stream_header);
+
+	if (stream->offset == stream->size)
+		stream->active = 0;
+	else
+		stream->active = 1;
+
+	/* No need to keep the fd open */
+	if (close(fd)) {
+		perror("close failed");
+		return -1;
+	}
+
+	return 0;
+}
+
+void
+emu_stream_data_set(struct emu_stream *stream, void *data)
+{
+	stream->data = data;
+}
+
+void *
+emu_stream_data_get(struct emu_stream *stream)
+{
+	return stream->data;
+}
diff --git a/src/emu/emu_stream.h b/src/emu/emu_stream.h
new file mode 100644
index 0000000..05f4810
--- /dev/null
+++ b/src/emu/emu_stream.h
@@ -0,0 +1,41 @@
+/* Copyright (c) 2021-2023 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
+
+#ifndef EMU_STREAM_H
+#define EMU_STREAM_H
+
+#include "heap.h"
+#include <stdint.h>
+#include <linux/limits.h>
+
+struct emu_stream;
+
+struct emu_stream {
+	char path[PATH_MAX];
+	char relpath[PATH_MAX]; /* To tracedir */
+
+	uint8_t *buf;
+	size_t size;
+	size_t offset;
+
+	int active;
+
+	double progress;
+
+	int64_t lastclock;
+	int64_t clock_offset;
+
+	heap_node_t hh;
+	struct emu_stream *next;
+	struct emu_stream *prev;
+
+	void *data; /* To hold system details */
+};
+
+int emu_stream_load(struct emu_stream *stream,
+		const char *tracedir, const char *relpath);
+
+void emu_stream_data_set(struct emu_stream *stream, void *data);
+void *emu_stream_data_get(struct emu_stream *stream);
+
+#endif /* EMU_STREAM_H */
diff --git a/src/emu/emu_trace.c b/src/emu/emu_trace.c
new file mode 100644
index 0000000..6ab6a39
--- /dev/null
+++ b/src/emu/emu_trace.c
@@ -0,0 +1,105 @@
+/* Copyright (c) 2021-2023 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
+
+#define _XOPEN_SOURCE 500
+
+#include "emu_trace.h"
+#include "utlist.h"
+#include <stdlib.h>
+#include <string.h>
+#include <ftw.h>
+
+/* See the nftw(3) manual to see why we need a global variable here:
+ * https://pubs.opengroup.org/onlinepubs/9699919799/functions/nftw.html */
+static struct emu_trace *cur_trace = NULL;
+
+static void
+trace_add(struct emu_trace *trace, struct emu_stream *stream)
+{
+	DL_APPEND(trace->streams, stream);
+	trace->nstreams++;
+}
+
+static int
+load_stream(struct emu_trace *trace, const char *path)
+{
+	struct emu_stream *stream = calloc(1, sizeof(struct emu_stream));
+
+	if (stream == NULL) {
+		perror("calloc failed");
+		return -1;
+	}
+
+	int offset = strlen(trace->tracedir);
+	const char *relpath = path + offset;
+
+	/* Skip begin slashes */
+	while (relpath[0] == '/') relpath++;
+
+	if (emu_stream_load(stream, trace->tracedir, relpath) != 0) {
+		err("load_stream: emu_steam_load failed\n");
+		return -1;
+	}
+
+	trace_add(trace, stream);
+
+	return 0;
+}
+
+static int
+has_suffix(const char *str, const char *suffix)
+{
+	if (!str || !suffix)
+		return 0;
+
+	int lenstr = strlen(str);
+	int lensuffix = strlen(suffix);
+
+	if (lensuffix > lenstr)
+		return 0;
+
+	const char *p = str + lenstr - lensuffix;
+	if (strncmp(p, suffix, lensuffix) == 0)
+		return 1;
+
+	return 0;
+}
+
+static int
+cb_nftw(const char *fpath, const struct stat *sb,
+		int typeflag, struct FTW *ftwbuf)
+{
+	UNUSED(sb);
+	UNUSED(ftwbuf);
+
+	if (typeflag != FTW_F)
+		return 0;
+
+	if (!has_suffix(fpath, ".ovnistream"))
+		return 0;
+
+	return load_stream(cur_trace, fpath);
+}
+
+int
+emu_trace_load(struct emu_trace *trace, const char *tracedir)
+{
+	cur_trace = trace;
+
+	if (snprintf(trace->tracedir, PATH_MAX, "%s", tracedir) >= PATH_MAX) {
+		err("emu_trace_load: path too long: %s\n", tracedir);
+		return -1;
+	}
+
+	/* Search recursively all streams in the trace directory */
+	if (nftw(tracedir, cb_nftw, 50, 0) != 0) {
+		err("emu_trace_load: nftw failed\n");
+		return -1;
+	}
+
+	cur_trace = NULL;
+
+	err("emu_trace_load: loaded %ld streams\n", trace->nstreams);
+
+	return 0;
+}
diff --git a/src/emu/emu_trace.h b/src/emu/emu_trace.h
new file mode 100644
index 0000000..e8ff49d
--- /dev/null
+++ b/src/emu/emu_trace.h
@@ -0,0 +1,22 @@
+/* Copyright (c) 2021-2023 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
+
+#ifndef EMU_TRACE_H
+#define EMU_TRACE_H
+
+#include "emu_stream.h"
+
+#include <linux/limits.h>
+
+struct emu_trace {
+	char tracedir[PATH_MAX];
+
+	long nstreams;
+	struct emu_stream *streams;
+
+	heap_head_t sorted_stream;
+};
+
+int emu_trace_load(struct emu_trace *trace, const char *tracedir);
+
+#endif /* EMU_TRACE_H */
diff --git a/src/emu/trace.c b/src/emu/trace.c
deleted file mode 100644
index 8885ff0..0000000
--- a/src/emu/trace.c
+++ /dev/null
@@ -1,650 +0,0 @@
-/* Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
- * SPDX-License-Identifier: GPL-3.0-or-later */
-
-#include "trace.h"
-
-#define _GNU_SOURCE
-#include <unistd.h>
-
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <linux/limits.h>
-#include <stdatomic.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <unistd.h>
-
-static int
-find_dir_prefix_str(const char *dirname, const char *prefix, const char **str)
-{
-	const char *p = dirname;
-
-	/* Check the prefix */
-	if (strncmp(p, prefix, strlen(prefix)) != 0)
-		return -1;
-
-	p += strlen(prefix);
-
-	/* Find the dot */
-	if (*p != '.')
-		return -1;
-
-	p++;
-
-	if (str)
-		*str = p;
-
-	return 0;
-}
-
-static int
-find_dir_prefix_int(const char *dirname, const char *prefix, int *num)
-{
-	const char *p = NULL;
-
-	if (find_dir_prefix_str(dirname, prefix, &p) != 0)
-		return -1;
-
-	/* Convert the suffix string to a number */
-	*num = atoi(p);
-
-	return 0;
-}
-
-static size_t
-count_dir_prefix(DIR *dir, const char *prefix)
-{
-	struct dirent *dirent;
-	size_t n = 0;
-
-	while ((dirent = readdir(dir)) != NULL) {
-		if (find_dir_prefix_str(dirent->d_name, prefix, NULL) != 0)
-			continue;
-
-		n++;
-	}
-
-	return n;
-}
-
-static int
-load_thread(struct ovni_ethread *thread, struct ovni_eproc *proc, int index, int tid, char *filepath)
-{
-	static int total_threads = 0;
-
-	thread->tid = tid;
-	thread->index = index;
-	thread->gindex = total_threads++;
-	thread->state = TH_ST_UNKNOWN;
-	thread->proc = proc;
-
-	if (strlen(filepath) >= PATH_MAX) {
-		err("filepath too large: %s\n", filepath);
-		return -1;
-	}
-
-	strcpy(thread->tracefile, filepath);
-
-	return 0;
-}
-
-static void
-load_proc_metadata(struct ovni_eproc *proc, int *rank_enabled)
-{
-	JSON_Object *meta = json_value_get_object(proc->meta);
-	if (meta == NULL)
-		die("load_proc_metadata: json_value_get_object() failed\n");
-
-	JSON_Value *appid_val = json_object_get_value(meta, "app_id");
-	if (appid_val == NULL)
-		die("process %d is missing app_id in metadata\n", proc->pid);
-
-	proc->appid = (int) json_number(appid_val);
-
-	JSON_Value *rank_val = json_object_get_value(meta, "rank");
-
-	if (rank_val != NULL) {
-		proc->rank = (int) json_number(rank_val);
-		*rank_enabled = 1;
-	} else {
-		proc->rank = -1;
-	}
-}
-
-static void
-check_metadata_version(struct ovni_eproc *proc)
-{
-	JSON_Object *meta = json_value_get_object(proc->meta);
-	if (meta == NULL)
-		die("check_metadata_version: json_value_get_object() failed\n");
-
-	JSON_Value *version_val = json_object_get_value(meta, "version");
-	if (version_val == NULL) {
-		die("process %d is missing attribute \"version\" in metadata\n",
-				proc->pid);
-	}
-
-	int version = (int) json_number(version_val);
-
-	if (version != OVNI_METADATA_VERSION) {
-		die("pid %d: metadata version mismatch %d (expected %d)\n",
-				proc->pid, version,
-				OVNI_METADATA_VERSION);
-	}
-
-	JSON_Value *mversion_val = json_object_get_value(meta, "model_version");
-	if (mversion_val == NULL) {
-		die("process %d is missing attribute \"model_version\" in metadata\n",
-				proc->pid);
-	}
-
-	const char *mversion = json_string(mversion_val);
-
-	if (strcmp(mversion, OVNI_MODEL_VERSION) != 0) {
-		die("pid %d: metadata model version mismatch '%s' (expected '%s')\n",
-				proc->pid, mversion,
-				OVNI_MODEL_VERSION);
-	}
-}
-
-static int
-compare_int(const void *a, const void *b)
-{
-	int aa = *(const int *) a;
-	int bb = *(const int *) b;
-
-	if (aa < bb)
-		return -1;
-	else if (aa > bb)
-		return +1;
-	else
-		return 0;
-}
-
-static int
-load_proc(struct ovni_eproc *proc, struct ovni_loom *loom, int index, int pid, char *procdir)
-{
-	static int total_procs = 0;
-
-	proc->pid = pid;
-	proc->index = index;
-	proc->gindex = total_procs++;
-	proc->loom = loom;
-
-	char path[PATH_MAX];
-	if (snprintf(path, PATH_MAX, "%s/%s", procdir, "metadata.json") >= PATH_MAX) {
-		err("snprintf: path too large: %s\n", procdir);
-		abort();
-	}
-
-	proc->meta = json_parse_file_with_comments(path);
-	if (proc->meta == NULL) {
-		err("error loading metadata from %s\n", path);
-		return -1;
-	}
-
-	check_metadata_version(proc);
-
-	/* The appid is populated from the metadata */
-	load_proc_metadata(proc, &loom->rank_enabled);
-
-	DIR *dir;
-	if ((dir = opendir(procdir)) == NULL) {
-		fprintf(stderr, "opendir %s failed: %s\n",
-				procdir, strerror(errno));
-		return -1;
-	}
-
-	proc->nthreads = count_dir_prefix(dir, "thread");
-
-	if (proc->nthreads <= 0) {
-		err("cannot find any thread for process %d\n",
-				proc->pid);
-		return -1;
-	}
-
-	proc->thread = calloc(proc->nthreads, sizeof(struct ovni_ethread));
-
-	if (proc->thread == NULL) {
-		perror("calloc failed");
-		return -1;
-	}
-
-	int *tids;
-
-	if ((tids = calloc(proc->nthreads, sizeof(int))) == NULL) {
-		perror("calloc failed\n");
-		return -1;
-	}
-
-	rewinddir(dir);
-
-	for (size_t i = 0; i < proc->nthreads;) {
-		struct dirent *dirent = readdir(dir);
-
-		if (dirent == NULL) {
-			err("inconsistent: readdir returned NULL\n");
-			return -1;
-		}
-
-		if (find_dir_prefix_int(dirent->d_name, "thread", &tids[i]) != 0)
-			continue;
-
-		i++;
-	}
-
-	closedir(dir);
-
-	/* Sort threads by ascending TID */
-	qsort(tids, proc->nthreads, sizeof(int), compare_int);
-
-	for (size_t i = 0; i < proc->nthreads; i++) {
-		int tid = tids[i];
-
-		if (snprintf(path, PATH_MAX, "%s/thread.%d", procdir, tid) >= PATH_MAX) {
-			err("snprintf: path too large: %s\n", procdir);
-			abort();
-		}
-
-		struct ovni_ethread *thread = &proc->thread[i];
-
-		if (load_thread(thread, proc, i, tid, path) != 0)
-			return -1;
-	}
-
-	free(tids);
-
-	return 0;
-}
-
-static int
-load_loom(struct ovni_loom *loom, char *loomdir)
-{
-	DIR *dir = NULL;
-
-	if ((dir = opendir(loomdir)) == NULL) {
-		fprintf(stderr, "opendir %s failed: %s\n",
-				loomdir, strerror(errno));
-		return -1;
-	}
-
-	loom->rank_enabled = 0;
-	loom->nprocs = count_dir_prefix(dir, "proc");
-
-	if (loom->nprocs <= 0) {
-		err("cannot find any process directory in loom %s\n",
-				loom->hostname);
-		return -1;
-	}
-
-	loom->proc = calloc(loom->nprocs, sizeof(struct ovni_eproc));
-
-	if (loom->proc == NULL) {
-		perror("calloc failed");
-		return -1;
-	}
-
-	rewinddir(dir);
-
-	size_t i = 0;
-	struct dirent *dirent = NULL;
-	while ((dirent = readdir(dir)) != NULL) {
-		int pid;
-		if (find_dir_prefix_int(dirent->d_name, "proc", &pid) != 0)
-			continue;
-
-		if (i >= loom->nprocs) {
-			err("more process than expected\n");
-			abort();
-		}
-
-		struct ovni_eproc *proc = &loom->proc[i];
-
-		if (snprintf(proc->dir, PATH_MAX, "%s/%s", loomdir, dirent->d_name) >= PATH_MAX) {
-			err("error: process dir name %s too long\n", dirent->d_name);
-			return -1;
-		}
-
-		if (load_proc(&loom->proc[i], loom, i, pid, proc->dir) != 0)
-			return -1;
-
-		i++;
-	}
-
-	if (i != loom->nprocs) {
-		err("unexpected number of processes\n");
-		abort();
-	}
-
-	closedir(dir);
-
-	/* Ensure all process have the rank, if enabled in any */
-	if (loom->rank_enabled) {
-		for (i = 0; i < loom->nprocs; i++) {
-			struct ovni_eproc *proc = &loom->proc[i];
-			if (proc->rank < 0) {
-				die("process %d is missing the rank\n",
-						proc->pid);
-			}
-		}
-	}
-
-	return 0;
-}
-
-static int
-compare_looms(const void *a, const void *b)
-{
-	struct ovni_loom *la = (struct ovni_loom *) a;
-	struct ovni_loom *lb = (struct ovni_loom *) b;
-	return strcmp(la->dname, lb->dname);
-}
-
-static void
-loom_to_host(const char *loom_name, char *host, int n)
-{
-	int i = 0;
-	for (i = 0; i < n; i++) {
-		/* Copy until dot or end */
-		if (loom_name[i] != '.' && loom_name[i] != '\0')
-			host[i] = loom_name[i];
-		else
-			break;
-	}
-
-	if (i == n)
-		die("loom host name %s too long\n", loom_name);
-
-	host[i] = '\0';
-}
-
-int
-ovni_load_trace(struct ovni_trace *trace, char *tracedir)
-{
-	DIR *dir = NULL;
-
-	if ((dir = opendir(tracedir)) == NULL) {
-		err("opendir %s failed: %s\n", tracedir, strerror(errno));
-		return -1;
-	}
-
-	trace->nlooms = count_dir_prefix(dir, "loom");
-
-	if (trace->nlooms == 0) {
-		err("cannot find any loom in %s\n", tracedir);
-		return -1;
-	}
-
-	trace->loom = calloc(trace->nlooms, sizeof(struct ovni_loom));
-
-	if (trace->loom == NULL) {
-		perror("calloc failed\n");
-		return -1;
-	}
-
-	rewinddir(dir);
-
-	size_t l = 0;
-	struct dirent *dirent = NULL;
-
-	while ((dirent = readdir(dir)) != NULL) {
-		struct ovni_loom *loom = &trace->loom[l];
-		const char *loom_name;
-		if (find_dir_prefix_str(dirent->d_name, "loom", &loom_name) != 0) {
-			/* Ignore other files in tracedir */
-			continue;
-		}
-
-		if (l >= trace->nlooms) {
-			err("extra loom detected\n");
-			return -1;
-		}
-
-		/* Copy the complete loom directory name to looms */
-		if (snprintf(loom->dname, PATH_MAX, "%s", dirent->d_name) >= PATH_MAX) {
-			err("error: loom name %s too long\n", dirent->d_name);
-			return -1;
-		}
-
-		l++;
-	}
-
-	closedir(dir);
-
-	/* Sort the looms, so we get the hostnames in alphanumeric order */
-	qsort(trace->loom, trace->nlooms, sizeof(struct ovni_loom),
-			compare_looms);
-
-	for (size_t i = 0; i < trace->nlooms; i++) {
-		struct ovni_loom *loom = &trace->loom[i];
-		const char *name = NULL;
-
-		if (find_dir_prefix_str(loom->dname, "loom", &name) != 0) {
-			err("error: mismatch for loom %s\n", loom->dname);
-			return -1;
-		}
-
-		loom_to_host(name, loom->hostname, sizeof(loom->hostname));
-
-		if (snprintf(loom->path, PATH_MAX, "%s/%s",
-				    tracedir, loom->dname)
-				>= PATH_MAX) {
-			err("error: loom path %s/%s too long\n",
-					tracedir, loom->dname);
-			return -1;
-		}
-
-		if (load_loom(loom, loom->path) != 0)
-			return -1;
-	}
-
-	return 0;
-}
-
-static int
-check_stream_header(struct ovni_stream *stream)
-{
-	int ret = 0;
-
-	if (stream->size < sizeof(struct ovni_stream_header)) {
-		err("stream %d: incomplete stream header\n",
-				stream->tid);
-		return -1;
-	}
-
-	struct ovni_stream_header *h =
-			(struct ovni_stream_header *) stream->buf;
-
-	if (memcmp(h->magic, OVNI_STREAM_MAGIC, 4) != 0) {
-		char magic[5];
-		memcpy(magic, h->magic, 4);
-		magic[4] = '\0';
-		err("stream %d: wrong stream magic '%s' (expected '%s')\n",
-				stream->tid, magic, OVNI_STREAM_MAGIC);
-		ret = -1;
-	}
-
-	if (h->version != OVNI_STREAM_VERSION) {
-		err("stream %d: stream version mismatch %u (expected %u)\n",
-				stream->tid, h->version, OVNI_STREAM_VERSION);
-		ret = -1;
-	}
-
-	return ret;
-}
-
-static int
-load_stream_fd(struct ovni_stream *stream, int fd)
-{
-	struct stat st;
-	if (fstat(fd, &st) < 0) {
-		perror("fstat failed");
-		return -1;
-	}
-
-	/* Error because it doesn't have the header */
-	if (st.st_size == 0) {
-		err("stream %d is empty\n", stream->tid);
-		return -1;
-	}
-
-	int prot = PROT_READ | PROT_WRITE;
-	stream->buf = mmap(NULL, st.st_size, prot, MAP_PRIVATE, fd, 0);
-
-	if (stream->buf == MAP_FAILED) {
-		perror("mmap failed");
-		return -1;
-	}
-
-	stream->size = st.st_size;
-
-	return 0;
-}
-
-static int
-load_stream_buf(struct ovni_stream *stream, struct ovni_ethread *thread)
-{
-	int fd;
-
-	if ((fd = open(thread->tracefile, O_RDWR)) == -1) {
-		perror("open failed");
-		return -1;
-	}
-
-	if (load_stream_fd(stream, fd) != 0)
-		return -1;
-
-	if (check_stream_header(stream) != 0) {
-		err("stream %d: bad header\n", stream->tid);
-		return -1;
-	}
-
-	stream->offset = sizeof(struct ovni_stream_header);
-
-	if (stream->offset == stream->size)
-		stream->active = 0;
-	else
-		stream->active = 1;
-
-	/* No need to keep the fd open */
-	if (close(fd)) {
-		perror("close failed");
-		return -1;
-	}
-
-	return 0;
-}
-
-/* Populates the streams in a single array */
-int
-ovni_load_streams(struct ovni_trace *trace)
-{
-	trace->nstreams = 0;
-
-	for (size_t i = 0; i < trace->nlooms; i++) {
-		struct ovni_loom *loom = &trace->loom[i];
-		for (size_t j = 0; j < loom->nprocs; j++) {
-			struct ovni_eproc *proc = &loom->proc[j];
-			for (size_t k = 0; k < proc->nthreads; k++) {
-				trace->nstreams++;
-			}
-		}
-	}
-
-	trace->stream = calloc(trace->nstreams, sizeof(struct ovni_stream));
-
-	if (trace->stream == NULL) {
-		perror("calloc failed");
-		return -1;
-	}
-
-	err("loaded %ld streams\n", trace->nstreams);
-
-	size_t s = 0;
-	for (size_t i = 0; i < trace->nlooms; i++) {
-		struct ovni_loom *loom = &trace->loom[i];
-		for (size_t j = 0; j < loom->nprocs; j++) {
-			struct ovni_eproc *proc = &loom->proc[j];
-			for (size_t k = 0; k < proc->nthreads; k++) {
-				struct ovni_ethread *thread = &proc->thread[k];
-				struct ovni_stream *stream = &trace->stream[s++];
-
-				stream->tid = thread->tid;
-				stream->thread = thread;
-				stream->proc = proc;
-				stream->loom = loom;
-				stream->lastclock = 0;
-				stream->offset = 0;
-				stream->cur_ev = NULL;
-
-				if (load_stream_buf(stream, thread) != 0) {
-					err("load_stream_buf failed\n");
-					return -1;
-				}
-			}
-		}
-	}
-
-	return 0;
-}
-
-void
-ovni_free_streams(struct ovni_trace *trace)
-{
-	for (size_t i = 0; i < trace->nstreams; i++) {
-		struct ovni_stream *stream = &trace->stream[i];
-		if (munmap(stream->buf, stream->size) != 0)
-			die("munmap stream failed: %s\n", strerror(errno));
-	}
-
-	free(trace->stream);
-}
-
-void
-ovni_free_trace(struct ovni_trace *trace)
-{
-	for (size_t i = 0; i < trace->nlooms; i++) {
-		for (size_t j = 0; j < trace->loom[i].nprocs; j++) {
-			free(trace->loom[i].proc[j].thread);
-		}
-
-		free(trace->loom[i].proc);
-	}
-
-	free(trace->loom);
-}
-
-int
-ovni_load_next_event(struct ovni_stream *stream)
-{
-	if (stream->active == 0) {
-		dbg("stream is inactive, cannot load more events\n");
-		return -1;
-	}
-
-	/* Only step the offset if we have load an event */
-	if (stream->cur_ev != NULL)
-		stream->offset += ovni_ev_size(stream->cur_ev);
-
-	/* It cannot overflow, otherwise we are reading garbage */
-	if (stream->offset > stream->size)
-		die("ovni_load_next_event: stream offset exceeds size\n");
-
-	/* We have reached the end */
-	if (stream->offset == stream->size) {
-		stream->active = 0;
-		stream->cur_ev = NULL;
-		dbg("stream %d runs out of events\n", stream->tid);
-		return -1;
-	}
-
-	stream->cur_ev = (struct ovni_ev *) &stream->buf[stream->offset];
-
-	return 0;
-}
diff --git a/src/emu/trace.h b/src/emu/trace.h
deleted file mode 100644
index 998a77f..0000000
--- a/src/emu/trace.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- * SPDX-License-Identifier: GPL-3.0-or-later */
-
-#ifndef OVNI_TRACE_H
-#define OVNI_TRACE_H
-
-#include "emu.h"
-#include "ovni.h"
-
-int ovni_load_next_event(struct ovni_stream *stream);
-
-int ovni_load_trace(struct ovni_trace *trace, char *tracedir);
-
-int ovni_load_streams(struct ovni_trace *trace);
-
-void ovni_free_streams(struct ovni_trace *trace);
-
-void ovni_free_trace(struct ovni_trace *trace);
-
-#endif /* OVNI_TRACE_H */