diff --git a/system/dev/bus/pci/kpci-private.h b/system/dev/bus/pci/kpci/kpci-private.h
similarity index 100%
rename from system/dev/bus/pci/kpci-private.h
rename to system/dev/bus/pci/kpci/kpci-private.h
diff --git a/system/dev/bus/pci/kpci.c b/system/dev/bus/pci/kpci/kpci.c
similarity index 100%
rename from system/dev/bus/pci/kpci.c
rename to system/dev/bus/pci/kpci/kpci.c
diff --git a/system/dev/bus/pci/proxy.c b/system/dev/bus/pci/kpci/proxy.c
similarity index 100%
rename from system/dev/bus/pci/proxy.c
rename to system/dev/bus/pci/kpci/proxy.c
diff --git a/system/dev/bus/pci/rules.mk b/system/dev/bus/pci/rules.mk
index 080246853f292a29fb802e078c0a330cb2117b4e..f1c5543e3ac4e19cc8f6d81e90c358512296637c 100644
--- a/system/dev/bus/pci/rules.mk
+++ b/system/dev/bus/pci/rules.mk
@@ -38,18 +38,32 @@ MODULE := $(LOCAL_DIR)
 
 MODULE_TYPE := driver
 MODULE_NAME := bus-pci
-MODULE_SRCS := $(LOCAL_DIR)/kpci.c
+MODULE_SRCS := $(LOCAL_DIR)/kpci/kpci.c
 MODULE_STATIC_LIBS := system/ulib/ddk
-MODULE_LIBS := system/ulib/driver system/ulib/zircon system/ulib/c
-MODULE_BANJO_LIBS := system/banjo/ddk-protocol-pci system/banjo/ddk-protocol-pciroot system/banjo/ddk-protocol-platform-device
+MODULE_LIBS := \
+    system/ulib/driver \
+    system/ulib/zircon \
+    system/ulib/c
+
+MODULE_BANJO_LIBS := \
+    system/banjo/ddk-protocol-pci \
+    system/banjo/ddk-protocol-pciroot \
+    system/banjo/ddk-protocol-platform-device
 include make/module.mk
 
 MODULE := $(LOCAL_DIR).proxy
 MODULE_TYPE := driver
 MODULE_NAME := bus-pci.proxy
-MODULE_SRCS := $(LOCAL_DIR)/proxy.c
+MODULE_SRCS := $(LOCAL_DIR)/kpci/proxy.c
 MODULE_STATIC_LIBS := system/ulib/ddk
-MODULE_LIBS := system/ulib/driver system/ulib/zircon system/ulib/c
-MODULE_BANJO_LIBS := system/banjo/ddk-protocol-pci system/banjo/ddk-protocol-pciroot system/banjo/ddk-protocol-platform-device
+MODULE_LIBS := \
+    system/ulib/driver \
+    system/ulib/zircon \
+    system/ulib/c
+
+MODULE_BANJO_LIBS := \
+    system/banjo/ddk-protocol-pci \
+    system/banjo/ddk-protocol-pciroot \
+    system/banjo/ddk-protocol-platform-device
 include make/module.mk
 endif