Index: boot/Makefile
===================================================================
--- boot/Makefile	(revision 8fefd8b580bf28eb98fa4eda780105c9d6409cc7)
+++ boot/Makefile	(revision 0e8c1584adefcff10cbc443b9c7e6d09632b6bc9)
@@ -67,6 +67,9 @@
 	cat "$(USPACE_PATH)/lib/c/arch/$(UARCH)/_link.ld" | sed 's/^STARTUP(.*)$$//g' > "$(DIST_PATH)/inc/_link.ld"
 endif
-	for file in $(RD_APPS) ; do \
-		cp "$$file" "$(DIST_PATH)/app/" ; \
+	for app in $(RD_APPS) ; do \
+		app_dir="`dirname "$$app"`" ; \
+		app_name="`basename "$$app"`" ; \
+		mkdir -p "$(DIST_PATH)/app/$$app_dir" ; \
+		cp "$(USPACE_PATH)/app/$$app/$$app_name" "$(DIST_PATH)/app/$$app" ; \
 	done
 	for file in $(RD_DATA) ; do \
Index: boot/Makefile.common
===================================================================
--- boot/Makefile.common	(revision 8fefd8b580bf28eb98fa4eda780105c9d6409cc7)
+++ boot/Makefile.common	(revision 0e8c1584adefcff10cbc443b9c7e6d09632b6bc9)
@@ -161,76 +161,69 @@
 endif
 
-RD_APPS_ESSENTIAL = \
-	$(USPACE_PATH)/app/bdsh/bdsh \
-	$(USPACE_PATH)/app/getterm/getterm \
-	$(USPACE_PATH)/app/kio/kio \
-	$(USPACE_PATH)/app/vlaunch/vlaunch \
-	$(USPACE_PATH)/app/vterm/vterm
+RD_APPS_ESSENTIAL = bdsh getterm kio vlaunch vterm
 
 RD_APPS_NON_ESSENTIAL = \
-	$(USPACE_PATH)/app/barber/barber \
-	$(USPACE_PATH)/app/bithenge/bithenge \
-	$(USPACE_PATH)/app/blkdump/blkdump \
-	$(USPACE_PATH)/app/bnchmark/bnchmark \
-	$(USPACE_PATH)/app/contacts/contacts \
-	$(USPACE_PATH)/app/corecfg/corecfg \
-	$(USPACE_PATH)/app/cpptest/cpptest \
-	$(USPACE_PATH)/app/devctl/devctl \
-	$(USPACE_PATH)/app/dnscfg/dnscfg \
-	$(USPACE_PATH)/app/dnsres/dnsres \
-	$(USPACE_PATH)/app/download/download \
-	$(USPACE_PATH)/app/edit/edit \
-	$(USPACE_PATH)/app/fdisk/fdisk \
-	$(USPACE_PATH)/app/gunzip/gunzip \
-	$(USPACE_PATH)/app/inet/inet \
-	$(USPACE_PATH)/app/kill/kill \
-	$(USPACE_PATH)/app/killall/killall \
-	$(USPACE_PATH)/app/loc/loc \
-	$(USPACE_PATH)/app/mixerctl/mixerctl \
-	$(USPACE_PATH)/app/modplay/modplay \
-	$(USPACE_PATH)/app/logset/logset \
-	$(USPACE_PATH)/app/mkfat/mkfat \
-	$(USPACE_PATH)/app/mkexfat/mkexfat \
-	$(USPACE_PATH)/app/mkext4/mkext4 \
-	$(USPACE_PATH)/app/mkmfs/mkmfs \
-	$(USPACE_PATH)/app/nic/nic \
-	$(USPACE_PATH)/app/rcutest/rcutest \
-	$(USPACE_PATH)/app/rcubench/rcubench \
-	$(USPACE_PATH)/app/sbi/sbi \
-	$(USPACE_PATH)/app/sportdmp/sportdmp \
-	$(USPACE_PATH)/app/redir/redir \
-	$(USPACE_PATH)/app/taskdump/taskdump \
-	$(USPACE_PATH)/app/tester/tester \
-	$(USPACE_PATH)/app/testread/testread \
-	$(USPACE_PATH)/app/testwrit/testwrit \
-	$(USPACE_PATH)/app/tetris/tetris \
-	$(USPACE_PATH)/app/tmon/tmon \
-	$(USPACE_PATH)/app/trace/trace \
-	$(USPACE_PATH)/app/netecho/netecho \
-	$(USPACE_PATH)/app/nterm/nterm \
-	$(USPACE_PATH)/app/ping/ping \
-	$(USPACE_PATH)/app/pkg/pkg \
-	$(USPACE_PATH)/app/stats/stats \
-	$(USPACE_PATH)/app/sysinfo/sysinfo \
-	$(USPACE_PATH)/app/sysinst/sysinst \
-	$(USPACE_PATH)/app/top/top \
-	$(USPACE_PATH)/app/untar/untar \
-	$(USPACE_PATH)/app/usbinfo/usbinfo \
-	$(USPACE_PATH)/app/vol/vol \
-	$(USPACE_PATH)/app/vuhid/vuh \
-	$(USPACE_PATH)/app/mkbd/mkbd \
-	$(USPACE_PATH)/app/websrv/websrv \
-	$(USPACE_PATH)/app/date/date \
-	$(USPACE_PATH)/app/vcalc/vcalc \
-	$(USPACE_PATH)/app/vdemo/vdemo \
-	$(USPACE_PATH)/app/viewer/viewer \
-	$(USPACE_PATH)/app/df/df \
-	$(USPACE_PATH)/app/fontviewer/fontviewer \
-	$(USPACE_PATH)/app/wifi_supplicant/wifi_supplicant
+	barber \
+	bithenge \
+	blkdump \
+	bnchmark \
+	contacts \
+	corecfg \
+	cpptest \
+	devctl \
+	dnscfg \
+	dnsres \
+	download \
+	edit \
+	fdisk \
+	gunzip \
+	inet \
+	kill \
+	killall \
+	loc \
+	mixerctl \
+	modplay \
+	logset \
+	mkfat \
+	mkexfat \
+	mkext4 \
+	mkmfs \
+	nic \
+	rcutest \
+	rcubench \
+	sbi \
+	sportdmp \
+	redir \
+	taskdump \
+	tester \
+	testread \
+	testwrit \
+	tetris \
+	tmon \
+	trace \
+	netecho \
+	nterm \
+	ping \
+	pkg \
+	stats \
+	sysinfo \
+	sysinst \
+	top \
+	untar \
+	usbinfo \
+	vol \
+	vuhid \
+	mkbd \
+	websrv \
+	date \
+	vcalc \
+	vdemo \
+	viewer \
+	df \
+	fontviewer \
+	wifi_supplicant
 
 ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
-	RD_APPS_NON_ESSENTIAL += \
-		$(USPACE_PATH)/app/dltest/dltest \
-		$(USPACE_PATH)/app/dltests/dltests
+	RD_APPS_NON_ESSENTIAL += dltest dltests
 endif
 
Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision 8fefd8b580bf28eb98fa4eda780105c9d6409cc7)
+++ boot/arch/amd64/Makefile.inc	(revision 0e8c1584adefcff10cbc443b9c7e6d09632b6bc9)
@@ -63,7 +63,7 @@
 
 RD_APPS_ESSENTIAL += \
-	$(USPACE_PATH)/app/edit/edit \
-	$(USPACE_PATH)/app/mixerctl/mixerctl \
-	$(USPACE_PATH)/app/wavplay/wavplay
+	edit \
+	mixerctl \
+	wavplay
 
 RD_DATA_NON_ESSENTIAL += \
Index: uspace/app/vuhid/Makefile
===================================================================
--- uspace/app/vuhid/Makefile	(revision 8fefd8b580bf28eb98fa4eda780105c9d6409cc7)
+++ uspace/app/vuhid/Makefile	(revision 0e8c1584adefcff10cbc443b9c7e6d09632b6bc9)
@@ -30,5 +30,5 @@
 # acronym for virtual USB human input device
 # (it is really annoying to write long names)
-BINARY = vuh
+BINARY = vuhid
 
 LIBS = usb usbdev usbhid usbvirt drv