diff --git a/pkg/release-alix/genimage.sh b/pkg/release-alix/genimage.sh
index 35711b1..9661df4 100755
--- a/pkg/release-alix/genimage.sh
+++ b/pkg/release-alix/genimage.sh
@@ -51,9 +51,9 @@ mount -t btrfs ${LODEV}p2 /tmp/mnt.$$
 MOUNTED=1
 mkdir /tmp/mnt.$$/etc /tmp/mnt.$$/etc_work
 mkdir /tmp/mnt.$$/var_lib /tmp/mnt.$$/var_lib_work
-mkdir /tmp/mnt.$$/root /tmp/mnt.$$/root_work
-chmod 750 /tmp/mnt.$$/root /tmp/mnt.$$/root_work
-chown 0:0 /tmp/mnt.$$/root /tmp/mnt.$$/root_work
+mkdir -p /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
+chmod 750 /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
+chown 0:0 /tmp/mnt.$$/usr/root
 umount /tmp/mnt.$$
 MOUNTED=0
 
diff --git a/pkg/release-alix/install.sh b/pkg/release-alix/install.sh
index 80dce85..3148bd7 100755
--- a/pkg/release-alix/install.sh
+++ b/pkg/release-alix/install.sh
@@ -56,9 +56,9 @@ mount -t btrfs ${DEVICE}2 /tmp/mnt.$$
 MOUNTED=1
 mkdir /tmp/mnt.$$/etc /tmp/mnt.$$/etc_work
 mkdir /tmp/mnt.$$/var_lib /tmp/mnt.$$/var_lib_work
-mkdir /tmp/mnt.$$/root /tmp/mnt.$$/root_work
-chmod 750 /tmp/mnt.$$/root /tmp/mnt.$$/root_work
-chown 0:0 /tmp/mnt.$$/root /tmp/mnt.$$/root_work
+mkdir -p /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
+chmod 750 /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
+chown 0:0 /tmp/mnt.$$/usr/root
 umount /tmp/mnt.$$
 MOUNTED=0
 
diff --git a/pkg/release-rpi3/genimage.sh b/pkg/release-rpi3/genimage.sh
index fed0bcd..3d51e88 100755
--- a/pkg/release-rpi3/genimage.sh
+++ b/pkg/release-rpi3/genimage.sh
@@ -49,9 +49,9 @@ mount -t btrfs ${LODEV}p2 /tmp/mnt.$$
 MOUNTED=1
 mkdir /tmp/mnt.$$/etc /tmp/mnt.$$/etc_work
 mkdir /tmp/mnt.$$/var_lib /tmp/mnt.$$/var_lib_work
-mkdir /tmp/mnt.$$/root /tmp/mnt.$$/root_work
-chmod 750 /tmp/mnt.$$/root /tmp/mnt.$$/root_work
-chown 0:0 /tmp/mnt.$$/root /tmp/mnt.$$/root_work
+mkdir -p /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
+chmod 750 /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
+chown 0:0 /tmp/mnt.$$/usr/root
 umount /tmp/mnt.$$
 MOUNTED=0
 
diff --git a/pkg/release-rpi3/install.sh b/pkg/release-rpi3/install.sh
index 33c75ee..5ca0a9f 100755
--- a/pkg/release-rpi3/install.sh
+++ b/pkg/release-rpi3/install.sh
@@ -54,9 +54,9 @@ mount -t btrfs ${DEVICE}p2 /tmp/mnt.$$
 MOUNTED=1
 mkdir /tmp/mnt.$$/etc /tmp/mnt.$$/etc_work
 mkdir /tmp/mnt.$$/var_lib /tmp/mnt.$$/var_lib_work
-mkdir /tmp/mnt.$$/root /tmp/mnt.$$/root_work
-chmod 750 /tmp/mnt.$$/root /tmp/mnt.$$/root_work
-chown 0:0 /tmp/mnt.$$/root /tmp/mnt.$$/root_work
+mkdir -p /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
+chmod 750 /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
+chown 0:0 /tmp/mnt.$$/usr/root
 umount /tmp/mnt.$$
 MOUNTED=0
 
diff --git a/pkg/rootfs/build b/pkg/rootfs/build
index 6ce5f6b..1695d01 100755
--- a/pkg/rootfs/build
+++ b/pkg/rootfs/build
@@ -31,19 +31,17 @@ build() {
 	echo $OS_RELEASE > $PKGBUILDDIR/etc/$fname
 
 	# setup root home directory
-	cp -r "$PKGBUILDDIR/etc/skel" "$PKGBUILDDIR/root"
-	chmod 750 "$PKGBUILDDIR/root"
+	mkdir -p "$PKGBUILDDIR/cfg/preserve/usr"
+
+	cp -r "$PKGBUILDDIR/etc/skel" "$PKGBUILDDIR/cfg/preserve/usr/root"
+	chmod 750 "$PKGBUILDDIR/cfg/preserve/usr/root"
 
 	# move configuration to preserve directory
-	mv ${PKGBUILDDIR}/etc ${PKGBUILDDIR}/cfg/preserve
-	mkdir -p ${PKGBUILDDIR}/etc
+	mv "$PKGBUILDDIR/etc" "$PKGBUILDDIR/cfg/preserve"
+	mv "$PKGBUILDDIR/var/lib" "$PKGBUILDDIR/cfg/preserve/var_lib"
+	rm -rf "$PKGBUILDDIR/var"
 
-	mv ${PKGBUILDDIR}/var/lib ${PKGBUILDDIR}/cfg/preserve/var_lib
-
-	mv ${PKGBUILDDIR}/root ${PKGBUILDDIR}/cfg/preserve
-	mkdir -p ${PKGBUILDDIR}/root
-	chmod 750 ${PKGBUILDDIR}/root
-	chmod 750 ${PKGBUILDDIR}/cfg/preserve/root
+	mkdir -p ${PKGBUILDDIR}/{etc,var}
 }
 
 deploy() {
diff --git a/pkg/rootfs/etc/passwd b/pkg/rootfs/etc/passwd
index 656ff75..08fb4d1 100644
--- a/pkg/rootfs/etc/passwd
+++ b/pkg/rootfs/etc/passwd
@@ -1,4 +1,4 @@
-root:x:0:0:root:/root:/bin/bash
+root:x:0:0:root:/usr/root:/bin/bash
 bin:x:1:1:bin:/dev/null:/bin/false
 daemon:x:6:6:Daemon User:/dev/null:/bin/false
 messagebus:x:18:18:D-Bus Message Daemon User:/var/run/dbus:/bin/false