Index: boot/Makefile.common
===================================================================
--- boot/Makefile.common	(revision 8786aa5c151fa5280b899437cecc4930c636823b)
+++ boot/Makefile.common	(revision 2ae1e6e3e2940795bbdd357a8edf68f9591a38ec)
@@ -45,29 +45,29 @@
 
 RD_SRVS = \
-	$(USPACEDIR)/srv/fb/fb \
-	$(USPACEDIR)/srv/kbd/kbd \
-	$(USPACEDIR)/srv/console/console \
+	$(USPACEDIR)/srv/bd/file_bd/file_bd \
+	$(USPACEDIR)/srv/bd/part/mbr_part/mbr_part \
 	$(USPACEDIR)/srv/clip/clip \
+	$(USPACEDIR)/srv/hid/fb/fb \
+	$(USPACEDIR)/srv/hid/kbd/kbd \
+	$(USPACEDIR)/srv/hid/console/console \
 	$(USPACEDIR)/srv/fs/devfs/devfs \
 	$(USPACEDIR)/srv/fs/tmpfs/tmpfs \
-	$(USPACEDIR)/srv/fs/fat/fat \
-	$(USPACEDIR)/srv/bd/file_bd/file_bd \
-	$(USPACEDIR)/srv/part/mbr_part/mbr_part
+	$(USPACEDIR)/srv/fs/fat/fat
 
 RD_APPS = \
+	$(USPACEDIR)/app/bdsh/bdsh \
 	$(USPACEDIR)/app/edit/edit \
 	$(USPACEDIR)/app/getterm/getterm \
+	$(USPACEDIR)/app/klog/klog \
 	$(USPACEDIR)/app/redir/redir \
+	$(USPACEDIR)/app/tester/tester \
 	$(USPACEDIR)/app/tetris/tetris \
-	$(USPACEDIR)/app/tester/tester \
-	$(USPACEDIR)/app/trace/trace \
-	$(USPACEDIR)/app/klog/klog \
-	$(USPACEDIR)/app/bdsh/bdsh
+	$(USPACEDIR)/app/trace/trace
 
 COMPONENTS = \
 	$(KERNELDIR)/kernel.bin \
 	$(USPACEDIR)/srv/ns/ns \
+	$(USPACEDIR)/srv/loader/loader \
 	$(USPACEDIR)/app/init/init \
-	$(USPACEDIR)/srv/loader/loader \
 	$(USPACEDIR)/srv/devmap/devmap \
 	$(USPACEDIR)/srv/bd/rd/rd \
Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision 8786aa5c151fa5280b899437cecc4930c636823b)
+++ boot/arch/amd64/Makefile.inc	(revision 2ae1e6e3e2940795bbdd357a8edf68f9591a38ec)
@@ -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 2ae1e6e3e2940795bbdd357a8edf68f9591a38ec)
@@ -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 = \