Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision c0cf6405e0a0c8d34d41c069d2074339e469286f)
+++ uspace/Makefile	(revision 95912659addfecdffc43b537a52e25be76dcf8f3)
@@ -33,24 +33,24 @@
 
 DIRS = \
-	libc \
-	softint \
-	softfloat \
-	init \
-	ns \
-	fb \
-	kbd \
-	console \
-	tetris \
-	tester \
-	klog \
-	rd \
-	fs
+	lib/libc \
+	lib/softint \
+	lib/softfloat \
+	srv/ns \
+	srv/fb \
+	srv/kbd \
+	srv/console \
+	srv/rd \
+	srv/fs \
+	app/tetris \
+	app/tester \
+	app/klog \
+	app/init
 
 ifeq ($(ARCH), amd64)
-	DIRS += pci
+	DIRS += srv/pci
 endif
 
 ifeq ($(ARCH), ia32)
-	DIRS += pci
+	DIRS += srv/pci
 endif