diff --git a/device.mk b/device.mk
index 2093576..e7ece67 100644
--- a/device.mk
+++ b/device.mk
@@ -33,6 +33,4 @@ PRODUCT_ENFORCE_RRO_TARGETS := \
     framework-res
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/rootdir/etc/fstab.flo:$(TARGET_COPY_OUT_RAMDISK)/fstab.flo \
-    $(LOCAL_PATH)/rootdir/etc/fstab.flo:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.flo \
-    $(LOCAL_PATH)/rootdir/etc/ueventd.flo.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc
+    $(LOCAL_PATH)/rootdir/etc/fstab.flo:$(TARGET_COPY_OUT_RAMDISK)/fstab.flo
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 79d62a3..616ead6 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -6,51 +6,46 @@ ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),flo)
 # deb also has fstab.flo and init.flo.rc
 include $(CLEAR_VARS)
 LOCAL_MODULE := fstab.flo
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES := etc/fstab.flo
-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.flo.rc
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw
 include $(BUILD_PREBUILT)
 
 endif
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := init.flo.power.rc
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES := etc/init.flo.power.rc
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := init.recovery.flo.rc
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES := etc/init.flo.power.rc
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)
 include $(BUILD_PREBUILT)
 
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := init.flo.usb.rc
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES := etc/init.flo.usb.rc
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := ueventd.flo.rc
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_STEM := ueventd.rc
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES := etc/ueventd.flo.rc
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)
 include $(BUILD_PREBUILT)
diff --git a/rootdir/etc/init.flo.rc b/rootdir/etc/init.flo.rc
index ff99d71..ec9a19e 100644
--- a/rootdir/etc/init.flo.rc
+++ b/rootdir/etc/init.flo.rc
@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-import init.flo.power.rc
-import init.flo.usb.rc
+import /vendor/etc/init/hw/init.flo.power.rc
+import /vendor/etc/init/hw/init.flo.usb.rc
 
 on early-init
     mount debugfs debugfs /sys/kernel/debug
@@ -37,7 +37,7 @@ on init
     setprop ro.kernel.ebpf.supported false
 
 on fs
-    mount_all fstab.flo --early
+    mount_all /vendor/etc/fstab.flo --early
     restorecon_recursive /persist
 
     # GnssConfiguration doesn't actually look at gps.conf, just the debug file
@@ -52,7 +52,7 @@ on late-fs
 
     wait_for_prop hwservicemanager.ready true
 
-    mount_all fstab.flo --late
+    mount_all /vendor/etc/fstab.flo --late
 
 on early-boot
     # set RLIMIT_MEMLOCK to 64MB