Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision 8786aa5c151fa5280b899437cecc4930c636823b)
+++ uspace/Makefile	(revision 385a3d6abf857946ce78cc42d9cd4f3a41dd103d)
@@ -33,44 +33,44 @@
 
 DIRS = \
+	app/bdsh \
+	app/edit \
+	app/getterm \
+	app/init \
+	app/klog \
+	app/redir \
+	app/tester \
+	app/tetris \
+	app/trace \
+	srv/clip \
+	srv/devmap \
+	srv/loader \
+	srv/ns \
+	srv/vfs \
 	srv/bd/ata_bd \
 	srv/bd/file_bd \
 	srv/bd/gxe_bd \
 	srv/bd/rd \
-	srv/ns \
-	srv/loader \
-	srv/fb \
-	srv/kbd \
-	srv/char/i8042 \
-	srv/console \
+	srv/bd/part/mbr_part \
 	srv/fs/fat \
 	srv/fs/tmpfs \
 	srv/fs/devfs \
-	srv/mouse/c_mouse \
-	srv/vfs \
-	srv/devmap \
-	srv/part/mbr_part \
-	srv/clip \
-	app/edit \
-	app/tetris \
-	app/tester \
-	app/trace \
-	app/klog \
-	app/init \
-	app/getterm \
-	app/redir \
-	app/bdsh
+	srv/hid/console \
+	srv/hid/c_mouse \
+	srv/hid/fb \
+	srv/hid/kbd \
+	srv/hw/char/i8042
 
 ifeq ($(UARCH),amd64)
-	DIRS += srv/pci
+	DIRS += srv/hw/bus/pci
 endif
 
 ifeq ($(UARCH),ia32)
-	DIRS += srv/pci
+	DIRS += srv/hw/bus/pci
 endif
 
 ifeq ($(UARCH),sparc64)
 	DIRS += \
-		srv/cir/fhc \
-		srv/cir/obio
+		srv/hw/cir/fhc \
+		srv/hw/cir/obio
 endif