Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision 8786aa5c151fa5280b899437cecc4930c636823b)
+++ boot/arch/amd64/Makefile.inc	(revision a5603ff22be15fb8915ab9fdfd71099525afeab1)
@@ -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))
Index: boot/arch/sparc64/loader/Makefile.common
===================================================================
--- boot/arch/sparc64/loader/Makefile.common	(revision 8786aa5c151fa5280b899437cecc4930c636823b)
+++ boot/arch/sparc64/loader/Makefile.common	(revision a5603ff22be15fb8915ab9fdfd71099525afeab1)
@@ -46,6 +46,6 @@
 RD_SRVS_GENERIC = \
 	$(USPACEDIR)/srv/fs/fat/fat \
-	$(USPACEDIR)/srv/cir/fhc/fhc \
-	$(USPACEDIR)/srv/cir/obio/obio
+	$(USPACEDIR)/srv/hw/cir/fhc/fhc \
+	$(USPACEDIR)/srv/hw/cir/obio/obio
 
 RD_APPS_GENERIC = \