Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision 9f51afc153c44459e18a16b5cf1077c88af5e883)
+++ boot/arch/amd64/Makefile.inc	(revision dc9162b9185e5bbf68a810f11aed714183f91ffd)
@@ -30,8 +30,8 @@
 
 RD_SRVS += \
-	$(USPACEDIR)/srv/pci/pci \
 	$(USPACEDIR)/srv/bd/ata_bd/ata_bd \
-	$(USPACEDIR)/srv/char/i8042/i8042 \
-	$(USPACEDIR)/srv/mouse/c_mouse/c_mouse
+	$(USPACEDIR)/srv/hw/char/i8042/i8042 \
+	$(USPACEDIR)/srv/hw/bus/pci/pci \
+	$(USPACEDIR)/srv/hid/c_mouse/c_mouse
 
 MODULES := $(notdir $(COMPONENTS))