Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision af2a76c3fbf1a0a9aee19905c674ce43f4ffc6db)
+++ uspace/Makefile	(revision da5ba3aa0a1b0c162a872b399b26e50601ef7c32)
@@ -131,6 +131,6 @@
 	srv/hid/rfb \
 	drv/audio/sb16 \
-	drv/infrastructure/root \
-	drv/infrastructure/rootvirt \
+	drv/root/root \
+	drv/root/virt \
 	drv/block/ahci \
 	drv/block/ata_bd \
@@ -162,5 +162,5 @@
 ifeq ($(UARCH), $(filter $(UARCH),amd64 ia32 ia64))
 	DIRS += \
-		drv/infrastructure/rootpc \
+		drv/platform/pc \
 		drv/bus/pci/pciintel \
 		drv/bus/isa \
@@ -173,5 +173,5 @@
 ifeq ($(UARCH), $(filter $(UARCH),mips32 mips32eb))
 	DIRS += \
-		drv/infrastructure/rootmalta \
+		drv/platform/malta \
 		drv/bus/pci/pciintel \
 		drv/bus/isa
@@ -180,5 +180,5 @@
 ifeq ($(UARCH),ppc32)
 	DIRS += \
-		drv/infrastructure/rootmac \
+		drv/platform/mac \
 		drv/bus/pci/pciintel \
 		srv/hw/bus/cuda_adb
@@ -192,5 +192,5 @@
 ifeq ($(UARCH),arm32)
 	DIRS += \
-		drv/infrastructure/rootamdm37x \
+		drv/platform/amdm37x \
 		drv/fb/amdm37x_dispc
 endif