diff --git a/common.mk b/common.mk
index 4127bc4..c637f3d 100644
--- a/common.mk
+++ b/common.mk
@@ -203,22 +203,53 @@ PRODUCT_PACKAGES += \
 # Init
 $(call soong_config_set,libinit,vendor_init_lib,//$(LOCAL_PATH):libinit_realme_sm7125)
 
-# Init scripts
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/rootdir/etc/fstab.default:$(TARGET_COPY_OUT_RAMDISK)/fstab.default \
-    $(LOCAL_PATH)/rootdir/etc/fstab.default:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.default
+# Init files and scripts for RMX2061
+PRODUCT_PACKAGES += \
+    fstab.default \
+    ueventd.qcom.rc
 
+# Ramdisk fstab copy
 PRODUCT_COPY_FILES += \
-    $(call find-copy-subdir-files,*,$(LOCAL_PATH)/rootdir/etc/odm/,$(TARGET_COPY_OUT_ODM)/etc/init/hw) \
-    $(call find-copy-subdir-files,*,$(LOCAL_PATH)/rootdir/etc/vendor/,$(TARGET_COPY_OUT_VENDOR)/etc/init/hw)
+    $(LOCAL_PATH)/rootdir/etc/fstab.default:$(TARGET_COPY_OUT_RAMDISK)/fstab.default
 
-PRODUCT_COPY_FILES += \
-    $(call find-copy-subdir-files,*,$(LOCAL_PATH)/rootdir/bin/,$(TARGET_COPY_OUT_VENDOR)/bin)
+    # ODM init files
+PRODUCT_PACKAGES += \
+    init.oppo.debug.diag.rc \
+    init.oppo.display.rc_odm
 
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/rootdir/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
-    $(LOCAL_PATH)/recovery/root/init.recovery.qcom.rc:recovery/root/init.recovery.qcom.rc \
-    $(LOCAL_PATH)/recovery/root/init.recovery.usb.rc:recovery/root/init.recovery.usb.rc
+# Vendor init files
+PRODUCT_PACKAGES += \
+    init.oppo.display.rc_vendor \
+    init.qcom.rc \
+    init.qti.ufs.rc \
+    init.target.rc \
+    init.qcom.factory.rc \
+    init.qcom.usb.rc \
+    init.sm7125.rc
+
+# Recovery init script
+PRODUCT_PACKAGES += \
+    init.recovery.qcom.sh
+
+# Vendor shell scripts
+PRODUCT_PACKAGES += \
+    init.at.class_main.sh \
+    init.qcom.class_core.sh \
+    init.qcom.sdio.sh \
+    init.qti.dcvs.sh \
+    init.at.post_boot.sh \
+    init.qcom.coex.sh \
+    init.qcom.sensors.sh \
+    init.qti.qcv.sh \
+    init.class_main.sh \
+    init.qcom.early_boot.sh \
+    init.qcom.sh \
+    init.crda.sh \
+    init.qcom.efs.sync.sh \
+    init.qcom.usb.sh \
+    init.mdm.sh \
+    init.qcom.post_boot.sh \
+    init.qti.chg_policy.sh
 
 # IPACM
 PRODUCT_PACKAGES += \
diff --git a/rootdir/Android.bp b/rootdir/Android.bp
new file mode 100644
index 0000000..d62d154
--- /dev/null
+++ b/rootdir/Android.bp
@@ -0,0 +1,195 @@
+//
+// Copyright (C) 2025 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+prebuilt_etc {
+    name: "fstab.default",
+    src: "etc/fstab.default",
+    vendor: true,
+    ramdisk_available: true,
+}
+
+prebuilt_etc {
+    name: "ueventd.qcom.rc",
+    filename: "ueventd.rc",
+    src: "ueventd.rc",
+    vendor: true,
+}
+
+// ODM-specific files in etc/odm/
+prebuilt_etc {
+    name: "init.oppo.debug.diag.rc",
+    src: "etc/odm/init.oppo.debug.diag.rc",
+    sub_dir: "init/hw",
+    device_specific: true,
+}
+
+prebuilt_etc {
+    name: "init.oppo.display.rc_odm",
+    src: "etc/odm/init.oppo.display.rc",
+    sub_dir: "init/hw",
+    device_specific: true,
+}
+
+// Vendor-specific files in etc/vendor/
+prebuilt_etc {
+    name: "init.oppo.display.rc_vendor",
+    src: "etc/vendor/init.oppo.display.rc",
+    sub_dir: "init/hw",
+    vendor: true,
+}
+
+prebuilt_etc {
+    name: "init.qcom.rc",
+    src: "etc/vendor/init.qcom.rc",
+    sub_dir: "init/hw",
+    vendor: true,
+}
+
+prebuilt_etc {
+    name: "init.qti.ufs.rc",
+    src: "etc/vendor/init.qti.ufs.rc",
+    sub_dir: "init/hw",
+    vendor: true,
+}
+
+prebuilt_etc {
+    name: "init.target.rc",
+    src: "etc/vendor/init.target.rc",
+    sub_dir: "init/hw",
+    vendor: true,
+}
+
+prebuilt_etc {
+    name: "init.qcom.factory.rc",
+    src: "etc/vendor/init.qcom.factory.rc",
+    sub_dir: "init/hw",
+    vendor: true,
+}
+
+prebuilt_etc {
+    name: "init.qcom.usb.rc",
+    src: "etc/vendor/init.qcom.usb.rc",
+    sub_dir: "init/hw",
+    vendor: true,
+}
+
+prebuilt_etc {
+    name: "init.sm7125.rc",
+    src: "etc/vendor/init.sm7125.rc",
+    sub_dir: "init/hw",
+    vendor: true,
+}
+
+// Recovery-specific file in bin/
+prebuilt_etc {
+    name: "init.recovery.qcom.sh",
+    src: "bin/init.recovery.qcom.sh",
+    filename: "init.recovery.qcom.sh",
+    recovery: true,
+    vendor: true,
+}
+
+// Vendor-specific shell scripts in bin/
+sh_binary {
+    name: "init.at.class_main.sh",
+    src: "bin/init.at.class_main.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.qcom.class_core.sh",
+    src: "bin/init.qcom.class_core.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.qcom.sdio.sh",
+    src: "bin/init.qcom.sdio.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.qti.dcvs.sh",
+    src: "bin/init.qti.dcvs.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.at.post_boot.sh",
+    src: "bin/init.at.post_boot.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.qcom.coex.sh",
+    src: "bin/init.qcom.coex.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.qcom.sensors.sh",
+    src: "bin/init.qcom.sensors.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.qti.qcv.sh",
+    src: "bin/init.qti.qcv.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.class_main.sh",
+    src: "bin/init.class_main.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.qcom.early_boot.sh",
+    src: "bin/init.qcom.early_boot.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.qcom.sh",
+    src: "bin/init.qcom.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.crda.sh",
+    src: "bin/init.crda.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.qcom.efs.sync.sh",
+    src: "bin/init.qcom.efs.sync.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.qcom.usb.sh",
+    src: "bin/init.qcom.usb.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.mdm.sh",
+    src: "bin/init.mdm.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.qcom.post_boot.sh",
+    src: "bin/init.qcom.post_boot.sh",
+    vendor: true,
+}
+
+sh_binary {
+    name: "init.qti.chg_policy.sh",
+    src: "bin/init.qti.chg_policy.sh",
+    vendor: true,
+}
\ No newline at end of file
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
deleted file mode 100644
index ee8010c..0000000
--- a/rootdir/Android.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)