Index: uspace/app/init/init.c
===================================================================
--- uspace/app/init/init.c	(revision 92864752b1dfddb2a35e0b2216820f6ed1dbeb0d)
+++ uspace/app/init/init.c	(revision 8fefd8b580bf28eb98fa4eda780105c9d6409cc7)
@@ -60,8 +60,8 @@
 #define TMPFS_MOUNT_POINT  "/tmp"
 
-#define SRV_CONSOLE  "/srv/console"
+#define SRV_CONSOLE  "/srv/hid/console"
 #define APP_GETTERM  "/app/getterm"
 
-#define SRV_COMPOSITOR  "/srv/compositor"
+#define SRV_COMPOSITOR  "/srv/hid/compositor"
 
 #define HID_INPUT              "hid/input"
@@ -413,14 +413,14 @@
 	/* Make sure file systems are running. */
 	if (str_cmp(STRING(RDFMT), "tmpfs") != 0)
-		srv_start("/srv/tmpfs");
+		srv_start("/srv/fs/tmpfs");
 	if (str_cmp(STRING(RDFMT), "exfat") != 0)
-		srv_start("/srv/exfat");
+		srv_start("/srv/fs/exfat");
 	if (str_cmp(STRING(RDFMT), "fat") != 0)
-		srv_start("/srv/fat");
-	srv_start("/srv/cdfs");
-	srv_start("/srv/mfs");
+		srv_start("/srv/fs/fat");
+	srv_start("/srv/fs/cdfs");
+	srv_start("/srv/fs/mfs");
 
 	srv_start("/srv/klog");
-	srv_start("/srv/locfs");
+	srv_start("/srv/fs/locfs");
 	srv_start("/srv/taskmon");
 
@@ -433,25 +433,25 @@
 
 	srv_start("/srv/devman");
-	srv_start("/srv/s3c24xx_uart");
-	srv_start("/srv/s3c24xx_ts");
-
-	srv_start("/srv/vbd");
+	srv_start("/srv/hid/s3c24xx_uart");
+	srv_start("/srv/hid/s3c24xx_ts");
+
+	srv_start("/srv/bd/vbd");
 	srv_start("/srv/volsrv");
 
-	srv_start("/srv/loopip");
-	srv_start("/srv/ethip");
-	srv_start("/srv/inetsrv");
-	srv_start("/srv/tcp");
-	srv_start("/srv/udp");
-	srv_start("/srv/dnsrsrv");
-	srv_start("/srv/dhcp");
-	srv_start("/srv/nconfsrv");
+	srv_start("/srv/net/loopip");
+	srv_start("/srv/net/ethip");
+	srv_start("/srv/net/inetsrv");
+	srv_start("/srv/net/tcp");
+	srv_start("/srv/net/udp");
+	srv_start("/srv/net/dnsrsrv");
+	srv_start("/srv/net/dhcp");
+	srv_start("/srv/net/nconfsrv");
 
 	srv_start("/srv/clipboard");
-	srv_start("/srv/remcons");
-
-	srv_start("/srv/input", HID_INPUT);
-	srv_start("/srv/output", HID_OUTPUT);
-	srv_start("/srv/hound");
+	srv_start("/srv/hid/remcons");
+
+	srv_start("/srv/hid/input", HID_INPUT);
+	srv_start("/srv/hid/output", HID_OUTPUT);
+	srv_start("/srv/audio/hound");
 
 	init_sysvol();
Index: uspace/app/sysinst/rdimg.c
===================================================================
--- uspace/app/sysinst/rdimg.c	(revision 92864752b1dfddb2a35e0b2216820f6ed1dbeb0d)
+++ uspace/app/sysinst/rdimg.c	(revision 8fefd8b580bf28eb98fa4eda780105c9d6409cc7)
@@ -43,5 +43,5 @@
 #include "rdimg.h"
 
-#define FILE_BD "/srv/file_bd"
+#define FILE_BD "/srv/bd/file_bd"
 #define RD_SVC "bd/iird"
 #define RD_LABEL "HelenOS-rd"
Index: uspace/srv/hw/char/s3c24xx_uart/Makefile
===================================================================
--- uspace/srv/hw/char/s3c24xx_uart/Makefile	(revision 92864752b1dfddb2a35e0b2216820f6ed1dbeb0d)
+++ uspace/srv/hw/char/s3c24xx_uart/Makefile	(revision 8fefd8b580bf28eb98fa4eda780105c9d6409cc7)
@@ -30,6 +30,5 @@
 USPACE_PREFIX = ../../../..
 
-# Need to use short name because of FAT 8+3 limit
-BINARY = s3c24ser
+BINARY = s3c24xx_uart
 
 SOURCES = \