diff --git a/CODEOWNERS b/CODEOWNERS
index ef7dc9ef1..4f88b8a27 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -35,5 +35,5 @@ fpga                                                @n-eiling
 # VFIO related files
 /common/lib/kernel/pci.cpp                          @n-eiling
 /common/lib/kernel/vfi_*.cpp                        @n-eiling
-/common/include/villas/kernel/pci.hpp               @n-eiling
+/common/include/villas/kernel/devices/pci_device.hpp               @n-eiling
 /common/include/villas/kernel/vfio_*.hpp            @n-eiling
diff --git a/common/include/villas/kernel/pci.hpp b/common/include/villas/kernel/devices/pci_device.hpp
similarity index 100%
rename from common/include/villas/kernel/pci.hpp
rename to common/include/villas/kernel/devices/pci_device.hpp
diff --git a/common/include/villas/kernel/vfio_device.hpp b/common/include/villas/kernel/vfio_device.hpp
index 9f8c51a7c..ce291bc27 100644
--- a/common/include/villas/kernel/vfio_device.hpp
+++ b/common/include/villas/kernel/vfio_device.hpp
@@ -19,7 +19,7 @@
 #include <linux/vfio.h>
 #include <sys/mman.h>
 
-#include <villas/kernel/pci.hpp>
+#include <villas/kernel/devices/pci_device.hpp>
 #include <villas/log.hpp>
 
 namespace villas {
diff --git a/common/lib/CMakeLists.txt b/common/lib/CMakeLists.txt
index 7927fc0f4..116d786e6 100644
--- a/common/lib/CMakeLists.txt
+++ b/common/lib/CMakeLists.txt
@@ -39,7 +39,7 @@ endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL Linux)
     target_sources(villas-common PRIVATE
-        kernel/pci.cpp
+        kernel/devices/pci_device.cpp
         kernel/vfio_device.cpp
         kernel/vfio_group.cpp
         kernel/vfio_container.cpp
diff --git a/common/lib/kernel/pci.cpp b/common/lib/kernel/devices/pci_device.cpp
similarity index 99%
rename from common/lib/kernel/pci.cpp
rename to common/lib/kernel/devices/pci_device.cpp
index c999f77e2..baf385072 100644
--- a/common/lib/kernel/pci.cpp
+++ b/common/lib/kernel/devices/pci_device.cpp
@@ -18,7 +18,7 @@
 
 #include <villas/config.hpp>
 #include <villas/exceptions.hpp>
-#include <villas/kernel/pci.hpp>
+#include <villas/kernel/devices/pci_device.hpp>
 #include <villas/utils.hpp>
 
 using namespace villas::kernel::pci;
diff --git a/fpga/gpu/src/gpu.cpp b/fpga/gpu/src/gpu.cpp
index f68d69265..f80a9521e 100644
--- a/fpga/gpu/src/gpu.cpp
+++ b/fpga/gpu/src/gpu.cpp
@@ -13,7 +13,7 @@
 #include <memory>
 
 #include <villas/gpu.hpp>
-#include <villas/kernel/pci.hpp>
+#include <villas/kernel/devices/pci_device.hpp>
 #include <villas/log.hpp>
 #include <villas/memory_manager.hpp>
 
diff --git a/fpga/include/villas/fpga/pcie_card.hpp b/fpga/include/villas/fpga/pcie_card.hpp
index f5368d399..d3ba2f54a 100644
--- a/fpga/include/villas/fpga/pcie_card.hpp
+++ b/fpga/include/villas/fpga/pcie_card.hpp
@@ -19,7 +19,7 @@
 #include <villas/memory.hpp>
 #include <villas/plugin.hpp>
 
-#include <villas/kernel/pci.hpp>
+#include <villas/kernel/devices/pci_device.hpp>
 #include <villas/kernel/vfio_container.hpp>
 
 #include <villas/fpga/card.hpp>
diff --git a/fpga/lib/pcie_card.cpp b/fpga/lib/pcie_card.cpp
index e2669820c..f44026fd6 100644
--- a/fpga/lib/pcie_card.cpp
+++ b/fpga/lib/pcie_card.cpp
@@ -14,7 +14,7 @@
 #include <villas/fpga/node.hpp>
 #include <villas/fpga/pcie_card.hpp>
 #include <villas/kernel/kernel.hpp>
-#include <villas/kernel/pci.hpp>
+#include <villas/kernel/devices/pci_device.hpp>
 #include <villas/kernel/vfio_container.hpp>
 #include <villas/memory.hpp>