diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index e513c00..449a296 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -179,6 +179,12 @@ TARGET_SYSTEM_PROP += $(VENDOR_PATH)/system.prop
 BOARD_USES_QCOM_HARDWARE := true
 BOARD_USES_QC_TIME_SERVICES := true
 
+# Ramdisk
+BOARD_ROOT_EXTRA_FOLDERS := dsp efs firmware firmware-modem persist
+BOARD_ROOT_EXTRA_SYMLINKS := /system/etc/firmware/btfw32.tlv:/bt_firmware/image/btfw32.tlv
+BOARD_ROOT_EXTRA_SYMLINKS += /system/etc/firmware/btnv32.bin:/bt_firmware/image/btnv32.bin
+BOARD_ROOT_EXTRA_SYMLINKS += /data/tombstones:/tombstones
+
 # Recovery
 TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/etc/fstab.qcom
 TARGET_USERIMAGES_USE_EXT4 := true
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index a20ee49..324b556 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -32,29 +32,10 @@ import init.target.rc
 on early-init
     export LD_SHIM_LIBS /system/bin/mm-qcamera-daemon|libc_shim.so
 
-    # Turn off backlight on blank
-    write /sys/class/leds/lcd-backlight/trigger "backlight"
-
-    mkdir /firmware 0771 system system
-    mkdir /firmware-modem 0771 system system
-    mkdir /system 0777 root root
-    symlink /data/tombstones /tombstones
-    mkdir /dsp 0771 media media
     mount debugfs debugfs /sys/kernel/debug
     chmod 0755 /sys/kernel/debug
 
-    mkdir /bt_firmware
-    mkdir /bt_firmware/image
-    symlink /system/etc/firmware/btfw32.tlv /bt_firmware/image/btfw32.tlv
-    symlink /system/etc/firmware/btnv32.bin /bt_firmware/image/btnv32.bin
-
 on init
-    # Set permissions for persist partition
-    mkdir /persist 0771 system system
-
-    # Set permissions for efs partition
-    mkdir /efs 0771 system radio
-
     # Support legacy paths
     symlink /sdcard /storage/sdcard0