Index: boot/Makefile.common
===================================================================
--- boot/Makefile.common	(revision 6c1c1f79aaaa7b2f5d4a551c5a9364e83ad78478)
+++ boot/Makefile.common	(revision da5ba3aa0a1b0c162a872b399b26e50601ef7c32)
@@ -127,6 +127,6 @@
 
 RD_DRVS_ESSENTIAL = \
-	infrastructure/root \
-	infrastructure/rootvirt \
+	root/root \
+	root/virt \
 	fb/kfb 
 
Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision 6c1c1f79aaaa7b2f5d4a551c5a9364e83ad78478)
+++ boot/arch/amd64/Makefile.inc	(revision da5ba3aa0a1b0c162a872b399b26e50601ef7c32)
@@ -35,5 +35,5 @@
 
 RD_DRVS_ESSENTIAL += \
-	infrastructure/rootpc \
+	platform/pc \
 	block/ata_bd \
 	bus/pci/pciintel \
Index: boot/arch/arm32/Makefile.inc
===================================================================
--- boot/arch/arm32/Makefile.inc	(revision 6c1c1f79aaaa7b2f5d4a551c5a9364e83ad78478)
+++ boot/arch/arm32/Makefile.inc	(revision da5ba3aa0a1b0c162a872b399b26e50601ef7c32)
@@ -66,5 +66,5 @@
 
 RD_DRVS_ESSENTIAL += \
-	infrastructure/rootamdm37x \
+	platform/amdm37x \
 	fb/amdm37x_dispc \
 	bus/usb/ehci \
Index: boot/arch/ia64/Makefile.inc
===================================================================
--- boot/arch/ia64/Makefile.inc	(revision 6c1c1f79aaaa7b2f5d4a551c5a9364e83ad78478)
+++ boot/arch/ia64/Makefile.inc	(revision da5ba3aa0a1b0c162a872b399b26e50601ef7c32)
@@ -66,5 +66,5 @@
 
 RD_DRVS_ESSENTIAL += \
-	infrastructure/rootpc \
+	platform/pc \
 	bus/pci/pciintel \
 	bus/isa \
Index: boot/arch/mips32/Makefile.inc
===================================================================
--- boot/arch/mips32/Makefile.inc	(revision 6c1c1f79aaaa7b2f5d4a551c5a9364e83ad78478)
+++ boot/arch/mips32/Makefile.inc	(revision da5ba3aa0a1b0c162a872b399b26e50601ef7c32)
@@ -52,5 +52,5 @@
 ifeq ($(MACHINE), $(filter $(MACHINE),bmalta lmalta))
 	RD_DRVS_ESSENTIAL += \
-		infrastructure/rootmalta \
+		platform/malta \
 		block/ata_bd \
 		bus/pci/pciintel \
Index: boot/arch/ppc32/Makefile.inc
===================================================================
--- boot/arch/ppc32/Makefile.inc	(revision 6c1c1f79aaaa7b2f5d4a551c5a9364e83ad78478)
+++ boot/arch/ppc32/Makefile.inc	(revision da5ba3aa0a1b0c162a872b399b26e50601ef7c32)
@@ -43,5 +43,5 @@
 
 RD_DRVS_ESSENTIAL += \
-	infrastructure/rootmac \
+	platform/mac \
 	bus/pci/pciintel \
 	bus/usb/ohci \