diff --git a/device.mk b/device.mk
index f2314b6..6ba4b4d 100644
--- a/device.mk
+++ b/device.mk
@@ -51,6 +51,4 @@ PRODUCT_ENFORCE_RRO_TARGETS := \
     framework-res
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/rootdir/etc/fstab.deb:$(TARGET_COPY_OUT_RAMDISK)/fstab.flo \
-    $(LOCAL_PATH)/rootdir/etc/fstab.deb:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.flo \
-    device/asus/flo/rootdir/etc/ueventd.flo.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc
+    $(LOCAL_PATH)/rootdir/etc/fstab.deb:$(TARGET_COPY_OUT_RAMDISK)/fstab.flo
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index a377e4b..dac901e 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -4,16 +4,14 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE  := fstab.flo
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES  := etc/fstab.deb
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE  := init.flo.rc
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES  := etc/init.deb.rc
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw
 include $(BUILD_PREBUILT)
diff --git a/rootdir/etc/init.deb.rc b/rootdir/etc/init.deb.rc
index 8f2ec52..e4550ea 100644
--- a/rootdir/etc/init.deb.rc
+++ b/rootdir/etc/init.deb.rc
@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-import init.flo.usb.rc
-import init.flo.power.rc
+import /vendor/etc/init/hw/init.flo.usb.rc
+import /vendor/etc/init/hw/init.flo.power.rc
 
 on early-init
     mount debugfs debugfs /sys/kernel/debug
@@ -37,7 +37,7 @@ on init
     mkdir /firmware 0771 system system
 
 on fs
-    mount_all fstab.flo
+    mount_all /vendor/etc/fstab.flo
     restorecon_recursive /persist
     write /sys/kernel/boot_adsp/boot 1