diff --git a/src/emu/CMakeLists.txt b/src/emu/CMakeLists.txt
index 47bbb21..6157f90 100644
--- a/src/emu/CMakeLists.txt
+++ b/src/emu/CMakeLists.txt
@@ -27,9 +27,9 @@ add_library(emu STATIC
   mux.c
   path.c
   proc.c
-  pcf.c
-  prv.c
-  pvt.c
+  pv/pcf.c
+  pv/prv.c
+  pv/pvt.c
   recorder.c
   system.c
   task.c
diff --git a/src/emu/cpu.c b/src/emu/cpu.c
index 47624ca..aace2f6 100644
--- a/src/emu/cpu.c
+++ b/src/emu/cpu.c
@@ -6,8 +6,7 @@
 #include "chan.h"
 #include "value.h"
 #include "utlist.h"
-#include "pvt.h"
-#include "prv.h"
+#include "pv/pvt.h"
 
 static const char chan_fmt[] = "cpu%ld.%s";
 static const char *chan_name[] = {
diff --git a/src/emu/pcf.c b/src/emu/pv/pcf.c
similarity index 100%
rename from src/emu/pcf.c
rename to src/emu/pv/pcf.c
diff --git a/src/emu/pcf.h b/src/emu/pv/pcf.h
similarity index 100%
rename from src/emu/pcf.h
rename to src/emu/pv/pcf.h
diff --git a/src/emu/prv.c b/src/emu/pv/prv.c
similarity index 100%
rename from src/emu/prv.c
rename to src/emu/pv/prv.c
diff --git a/src/emu/prv.h b/src/emu/pv/prv.h
similarity index 100%
rename from src/emu/prv.h
rename to src/emu/pv/prv.h
diff --git a/src/emu/pvt.c b/src/emu/pv/pvt.c
similarity index 100%
rename from src/emu/pvt.c
rename to src/emu/pv/pvt.c
diff --git a/src/emu/pvt.h b/src/emu/pv/pvt.h
similarity index 100%
rename from src/emu/pvt.h
rename to src/emu/pv/pvt.h
diff --git a/src/emu/recorder.h b/src/emu/recorder.h
index dd3a9ff..9a12052 100644
--- a/src/emu/recorder.h
+++ b/src/emu/recorder.h
@@ -6,7 +6,7 @@
 
 /* Records data into files (Paraver traces only for now) */
 
-#include "pvt.h"
+#include "pv/pvt.h"
 
 #include <linux/limits.h>
 
diff --git a/src/emu/task.c b/src/emu/task.c
index 4ce6a27..c60616c 100644
--- a/src/emu/task.c
+++ b/src/emu/task.c
@@ -3,9 +3,7 @@
 
 #include "task.h"
 
-#include "uthash.h"
 #include "utlist.h"
-#include "pcf.h"
 
 struct task *
 task_find(struct task *tasks, uint32_t task_id)
diff --git a/src/emu/task.h b/src/emu/task.h
index e35efd2..0cbf115 100644
--- a/src/emu/task.h
+++ b/src/emu/task.h
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 #include "uthash.h"
-#include "pcf.h"
+#include "pv/pcf.h"
 #include "thread.h"
 
 enum task_state {
diff --git a/test/unit/prv.c b/test/unit/prv.c
index a06c3d3..96d5930 100644
--- a/test/unit/prv.c
+++ b/test/unit/prv.c
@@ -1,6 +1,6 @@
 #define _GNU_SOURCE
 
-#include "emu/prv.h"
+#include "emu/pv/prv.h"
 #include "common.h"
 
 #include <stdio.h>