diff --git a/Android.bp b/Android.bp
index 1d6cdca..2eb7e28 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,16 +16,16 @@ cc_prebuilt_library_shared {
 	},
 	target: {
 		android_arm: {
-			srcs: ["proprietary/product/lib/vendor.qti.hardware.fm@1.0.so"],
+			srcs: ["proprietary/system_ext/lib/vendor.qti.hardware.fm@1.0.so"],
 		},
 		android_arm64: {
-			srcs: ["proprietary/product/lib64/vendor.qti.hardware.fm@1.0.so"],
+			srcs: ["proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so"],
 		},
 	},
 	compile_multilib: "both",
 	check_elf_files: false,
 	prefer: true,
-	product_specific: true,
+	system_ext_specific: true,
 }
 
 prebuilt_etc_xml {
diff --git a/beryllium-vendor.mk b/beryllium-vendor.mk
index 9672084..00ce9f1 100644
--- a/beryllium-vendor.mk
+++ b/beryllium-vendor.mk
@@ -6,10 +6,10 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/xiaomi/beryllium
 
 PRODUCT_COPY_FILES += \
-    vendor/xiaomi/beryllium/proprietary/lib/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM)/lib/fm_helium.so \
-    vendor/xiaomi/beryllium/proprietary/lib/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libfm-hci.so \
-    vendor/xiaomi/beryllium/proprietary/lib64/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/fm_helium.so \
-    vendor/xiaomi/beryllium/proprietary/lib64/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libfm-hci.so \
+    vendor/xiaomi/beryllium/proprietary/system_ext/lib/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/fm_helium.so \
+    vendor/xiaomi/beryllium/proprietary/system_ext/lib/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libfm-hci.so \
+    vendor/xiaomi/beryllium/proprietary/system_ext/lib64/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/fm_helium.so \
+    vendor/xiaomi/beryllium/proprietary/system_ext/lib64/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libfm-hci.so \
     vendor/xiaomi/beryllium/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.bluetooth@1.0-service-qti \
     vendor/xiaomi/beryllium/proprietary/vendor/bin/hw/android.hardware.gnss@2.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gnss@2.0-service-qti \
     vendor/xiaomi/beryllium/proprietary/vendor/bin/hw/android.hardware.keymaster@3.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.keymaster@3.0-service-qti \
diff --git a/proprietary/lib/fm_helium.so b/proprietary/system_ext/lib/fm_helium.so
similarity index 100%
rename from proprietary/lib/fm_helium.so
rename to proprietary/system_ext/lib/fm_helium.so
diff --git a/proprietary/lib/libfm-hci.so b/proprietary/system_ext/lib/libfm-hci.so
similarity index 100%
rename from proprietary/lib/libfm-hci.so
rename to proprietary/system_ext/lib/libfm-hci.so
diff --git a/proprietary/product/lib/vendor.qti.hardware.fm@1.0.so b/proprietary/system_ext/lib/vendor.qti.hardware.fm@1.0.so
similarity index 100%
rename from proprietary/product/lib/vendor.qti.hardware.fm@1.0.so
rename to proprietary/system_ext/lib/vendor.qti.hardware.fm@1.0.so
diff --git a/proprietary/lib64/fm_helium.so b/proprietary/system_ext/lib64/fm_helium.so
similarity index 100%
rename from proprietary/lib64/fm_helium.so
rename to proprietary/system_ext/lib64/fm_helium.so
diff --git a/proprietary/lib64/libfm-hci.so b/proprietary/system_ext/lib64/libfm-hci.so
similarity index 100%
rename from proprietary/lib64/libfm-hci.so
rename to proprietary/system_ext/lib64/libfm-hci.so
diff --git a/proprietary/product/lib64/vendor.qti.hardware.fm@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so
similarity index 100%
rename from proprietary/product/lib64/vendor.qti.hardware.fm@1.0.so
rename to proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so