diff --git a/Android.bp b/Android.bp
index 8faf234..f4717c2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -144,7 +144,7 @@ android_app_import {
 dex_import {
 	name: "WfdCommon",
 	owner: "motorola",
-	jars: ["proprietary/framework/WfdCommon.jar"],
+	jars: ["proprietary/system/framework/WfdCommon.jar"],
 }
 
 dex_import {
diff --git a/proprietary/etc/permissions/privapp-permissions-qti.xml b/proprietary/system/etc/permissions/privapp-permissions-qti.xml
similarity index 100%
rename from proprietary/etc/permissions/privapp-permissions-qti.xml
rename to proprietary/system/etc/permissions/privapp-permissions-qti.xml
diff --git a/proprietary/etc/sysconfig/qti_whitelist.xml b/proprietary/system/etc/sysconfig/qti_whitelist.xml
similarity index 100%
rename from proprietary/etc/sysconfig/qti_whitelist.xml
rename to proprietary/system/etc/sysconfig/qti_whitelist.xml
diff --git a/proprietary/framework/WfdCommon.jar b/proprietary/system/framework/WfdCommon.jar
similarity index 100%
rename from proprietary/framework/WfdCommon.jar
rename to proprietary/system/framework/WfdCommon.jar
diff --git a/sm6225-common-vendor.mk b/sm6225-common-vendor.mk
index ff89572..3d1b7a6 100644
--- a/sm6225-common-vendor.mk
+++ b/sm6225-common-vendor.mk
@@ -6,15 +6,15 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/motorola/sm6225-common
 
 PRODUCT_COPY_FILES += \
-    vendor/motorola/sm6225-common/proprietary/system_ext/etc/permissions/moto-telephony.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/moto-telephony.xml \
-    vendor/motorola/sm6225-common/proprietary/etc/permissions/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
-    vendor/motorola/sm6225-common/proprietary/etc/sysconfig/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \
     vendor/motorola/sm6225-common/proprietary/product/etc/permissions/UimGba.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/UimGba.xml \
     vendor/motorola/sm6225-common/proprietary/product/etc/permissions/UimGbaManager.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/UimGbaManager.xml \
     vendor/motorola/sm6225-common/proprietary/product/etc/permissions/UimService.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/UimService.xml \
     vendor/motorola/sm6225-common/proprietary/product/etc/permissions/com.motorola.moto-uirefresh.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.motorola.moto-uirefresh.xml \
     vendor/motorola/sm6225-common/proprietary/product/etc/permissions/com.motorola.motodisplay.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.motorola.motodisplay.xml \
     vendor/motorola/sm6225-common/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/telephony_product_privapp-permissions-qti.xml \
+    vendor/motorola/sm6225-common/proprietary/system_ext/etc/permissions/moto-telephony.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/moto-telephony.xml \
+    vendor/motorola/sm6225-common/proprietary/system/etc/permissions/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
+    vendor/motorola/sm6225-common/proprietary/system/etc/sysconfig/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \
     vendor/motorola/sm6225-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \
     vendor/motorola/sm6225-common/proprietary/system_ext/bin/wfdservice:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/wfdservice \
     vendor/motorola/sm6225-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \