Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision 2e7f392bf62ebe2b3a72127630048491ee783b85)
+++ uspace/Makefile	(revision 472020fcce0d34f10b66ca0bd38c3b005abb9a4c)
@@ -50,8 +50,11 @@
 	app/trace \
 	app/top \
+	app/netecho \
+	app/nettest1 \
+	app/nettest2 \
+	app/ping \
 	srv/clip \
 	srv/devmap \
 	srv/devman \
-	srv/drivers/root \
 	srv/loader \
 	srv/ns \
@@ -84,8 +87,5 @@
 	srv/net/net \
 	srv/net/netstart \
-	app/netecho \
-	app/nettest1 \
-	app/nettest2 \
-	app/ping
+	drv/root
 
 ## Networking
@@ -113,8 +113,8 @@
 
 ifeq ($(UARCH),ia32)
-	DIRS += srv/drivers/rootia32
-	DIRS += srv/drivers/pciintel
-	DIRS += srv/drivers/isa
-	DIRS += srv/drivers/ns8250
+	DIRS += drv/rootia32
+	DIRS += drv/pciintel
+	DIRS += drv/isa
+	DIRS += drv/ns8250
 endif