diff --git a/src/add-ons/kernel/busses/random/Jamfile b/src/add-ons/kernel/busses/random/Jamfile
index c7577d9ac0..0ef0a5f141 100644
--- a/src/add-ons/kernel/busses/random/Jamfile
+++ b/src/add-ons/kernel/busses/random/Jamfile
@@ -1,13 +1,5 @@
 SubDir HAIKU_TOP src add-ons kernel busses random ;
 
-UsePrivateHeaders drivers virtio ;
-UsePrivateKernelHeaders ;
-
-KernelAddon virtio_rng :
-	virtio_rng.cpp
-	VirtioRNGDevice.cpp
-;
-
-
 SubInclude HAIKU_TOP src add-ons kernel busses random ccp ;
+SubInclude HAIKU_TOP src add-ons kernel busses random virtio ;
 
diff --git a/src/add-ons/kernel/busses/random/virtio/Jamfile b/src/add-ons/kernel/busses/random/virtio/Jamfile
new file mode 100644
index 0000000000..3d74210ae9
--- /dev/null
+++ b/src/add-ons/kernel/busses/random/virtio/Jamfile
@@ -0,0 +1,10 @@
+SubDir HAIKU_TOP src add-ons kernel busses random virtio ;
+
+UsePrivateHeaders drivers virtio ;
+UsePrivateKernelHeaders ;
+
+KernelAddon virtio_rng :
+	virtio_rng.cpp
+	VirtioRNGDevice.cpp
+;
+
diff --git a/src/add-ons/kernel/busses/random/VirtioRNGDevice.cpp b/src/add-ons/kernel/busses/random/virtio/VirtioRNGDevice.cpp
similarity index 100%
rename from src/add-ons/kernel/busses/random/VirtioRNGDevice.cpp
rename to src/add-ons/kernel/busses/random/virtio/VirtioRNGDevice.cpp
diff --git a/src/add-ons/kernel/busses/random/VirtioRNGPrivate.h b/src/add-ons/kernel/busses/random/virtio/VirtioRNGPrivate.h
similarity index 100%
rename from src/add-ons/kernel/busses/random/VirtioRNGPrivate.h
rename to src/add-ons/kernel/busses/random/virtio/VirtioRNGPrivate.h
diff --git a/src/add-ons/kernel/busses/random/virtio_rng.cpp b/src/add-ons/kernel/busses/random/virtio/virtio_rng.cpp
similarity index 100%
rename from src/add-ons/kernel/busses/random/virtio_rng.cpp
rename to src/add-ons/kernel/busses/random/virtio/virtio_rng.cpp