diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index 3c68d2f..8fca5ab 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -57,25 +57,25 @@
 /system/etc/firmware/wcd9310/wcd9310_anc.bin
 /system/etc/firmware/wcd9310/wcd9310_mbhc.bin
 /system/etc/gps.conf
-/system/lib/egl/eglsubAndroid.so
-/system/lib/egl/libEGL_adreno.so
-/system/lib/egl/libGLESv1_CM_adreno.so
-/system/lib/egl/libGLESv2_adreno.so
-/system/lib/egl/libplayback_adreno.so
-/system/lib/egl/libq3dtools_adreno.so
+/system/vendor/lib/egl/eglsubAndroid.so
+/system/vendor/lib/egl/libEGL_adreno.so
+/system/vendor/lib/egl/libGLESv1_CM_adreno.so
+/system/vendor/lib/egl/libGLESv2_adreno.so
+/system/vendor/lib/egl/libplayback_adreno.so
+/system/vendor/lib/egl/libq3dtools_adreno.so
 /system/lib/hw/flp.msm8960.so
 /system/lib/hw/gps.msm8960.so
 /system/lib/hw/sensors.msm8960.so
 /system/lib/libacdbdata.so
 /system/lib/libacdbloader.so
-/system/lib/libadreno_utils.so
+/system/vendor/lib/libadreno_utils.so
 /system/lib/libAKM.so
 /system/lib/libaudcal.so
 /system/lib/libaudioalsa.so
-/system/lib/libC2D2.so
-/system/lib/libc2d30-a3xx.so
-/system/lib/libc2d30.so
-/system/lib/libCB.so
+/system/vendor/lib/libC2D2.so
+/system/vendor/lib/libc2d30-a3xx.so
+/system/vendor/lib/libc2d30.so
+/system/vendor/lib/libCB.so
 /system/lib/libchromatix_ov5693_common.so
 /system/lib/libchromatix_ov5693_default_video.so
 /system/lib/libchromatix_ov5693_preview.so
@@ -92,11 +92,11 @@
 /system/lib/libdsucsd.so
 /system/lib/libdsutils.so
 /system/lib/libgps.utils.so
-/system/lib/libgsl.so
+/system/vendor/lib/libgsl.so
 /system/lib/libI420colorconvert.so
 /system/lib/libidl.so
-/system/lib/libllvm-qcom.so
-/system/lib/libbccQTI.so
+/system/vendor/lib/libllvm-qcom.so
+/system/vendor/lib/libbccQTI.so
 /system/lib/libloc_core.so
 /system/lib/libloc_eng.so
 /system/lib/libmm-abl.so
@@ -119,10 +119,10 @@
 /system/lib/libqmi_csvt_srvc.so
 /system/lib/libqmi_encdec.so
 /system/lib/libQSEEComAPI.so
-/system/lib/libRSDriver_adreno.so
-/system/lib/librs_adreno.so
-/system/lib/librs_adreno_sha1.so
-/system/lib/libsc-a3xx.so
+/system/vendor/lib/libRSDriver_adreno.so
+/system/vendor/lib/librs_adreno.so
+/system/vendor/lib/librs_adreno_sha1.so
+/system/vendor/lib/libsc-a3xx.so
 /system/lib/libsensor1.so
 /system/lib/libsensor_reg.so
 /system/lib/libsensor_user_cal.so
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index d6c17cf..dc4bfb8 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -48,23 +48,23 @@
             system/etc/firmware/vidcfw.elf \
             system/etc/firmware/vidc.mdt \
             system/etc/gps.conf \
-            system/lib/egl/eglsubAndroid.so \
-            system/lib/egl/libEGL_adreno.so \
-            system/lib/egl/libGLESv1_CM_adreno.so \
-            system/lib/egl/libGLESv2_adreno.so \
-            system/lib/egl/libplayback_adreno.so \
-            system/lib/egl/libq3dtools_adreno.so \
+            system/vendor/lib/egl/eglsubAndroid.so \
+            system/vendor/lib/egl/libEGL_adreno.so \
+            system/vendor/lib/egl/libGLESv1_CM_adreno.so \
+            system/vendor/lib/egl/libGLESv2_adreno.so \
+            system/vendor/lib/egl/libplayback_adreno.so \
+            system/vendor/lib/egl/libq3dtools_adreno.so \
             system/lib/hw/flp.msm8960.so \
             system/lib/hw/gps.msm8960.so \
             system/lib/hw/sensors.msm8960.so \
             system/lib/libacdbloader.so \
-            system/lib/libadreno_utils.so \
+            system/vendor/lib/libadreno_utils.so \
             system/lib/libaudcal.so \
             system/lib/libaudioalsa.so \
-            system/lib/libC2D2.so \
-            system/lib/libc2d30-a3xx.so \
-            system/lib/libc2d30.so \
-            system/lib/libCB.so \
+            system/vendor/lib/libC2D2.so \
+            system/vendor/lib/libc2d30-a3xx.so \
+            system/vendor/lib/libc2d30.so \
+            system/vendor/lib/libCB.so \
             system/lib/libchromatix_ov5693_common.so \
             system/lib/libchromatix_ov5693_default_video.so \
             system/lib/libchromatix_ov5693_preview.so \
@@ -81,11 +81,11 @@
             system/lib/libdsucsd.so \
             system/lib/libdsutils.so \
             system/lib/libgps.utils.so \
-            system/lib/libgsl.so \
+            system/vendor/lib/libgsl.so \
             system/lib/libI420colorconvert.so \
             system/lib/libidl.so \
-            system/lib/libllvm-qcom.so \
-            system/lib/libbccQTI.so \
+            system/vendor/lib/libllvm-qcom.so \
+            system/vendor/lib/libbccQTI.so \
             system/lib/libloc_core.so \
             system/lib/libloc_eng.so \
             system/lib/libmm-abl.so \
@@ -108,10 +108,10 @@
             system/lib/libqmiservices.so \
             system/lib/libqmi.so \
             system/lib/libQSEEComAPI.so \
-            system/lib/librs_adreno_sha1.so \
-            system/lib/librs_adreno.so \
-            system/lib/libRSDriver_adreno.so \
-            system/lib/libsc-a3xx.so \
+            system/vendor/lib/librs_adreno_sha1.so \
+            system/vendor/lib/librs_adreno.so \
+            system/vendor/lib/libRSDriver_adreno.so \
+            system/vendor/lib/libsc-a3xx.so \
             system/lib/libsensor1.so \
             system/lib/libsensor_reg.so \
             system/lib/libsensor_user_cal.so \
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 0a58d02..d221a2d 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -98,23 +98,23 @@
             system/etc/firmware/vidcfw.elf \
             system/etc/firmware/vidc.mdt \
             system/etc/gps.conf \
-            system/lib/egl/eglsubAndroid.so \
-            system/lib/egl/libEGL_adreno.so \
-            system/lib/egl/libGLESv1_CM_adreno.so \
-            system/lib/egl/libGLESv2_adreno.so \
-            system/lib/egl/libplayback_adreno.so \
-            system/lib/egl/libq3dtools_adreno.so \
+            system/vendor/lib/egl/eglsubAndroid.so \
+            system/vendor/lib/egl/libEGL_adreno.so \
+            system/vendor/lib/egl/libGLESv1_CM_adreno.so \
+            system/vendor/lib/egl/libGLESv2_adreno.so \
+            system/vendor/lib/egl/libplayback_adreno.so \
+            system/vendor/lib/egl/libq3dtools_adreno.so \
             system/lib/hw/flp.msm8960.so \
             system/lib/hw/gps.msm8960.so \
             system/lib/hw/sensors.msm8960.so \
             system/lib/libacdbloader.so \
-            system/lib/libadreno_utils.so \
+            system/vendor/lib/libadreno_utils.so \
             system/lib/libaudcal.so \
             system/lib/libaudioalsa.so \
-            system/lib/libC2D2.so \
-            system/lib/libc2d30-a3xx.so \
-            system/lib/libc2d30.so \
-            system/lib/libCB.so \
+            system/vendor/lib/libC2D2.so \
+            system/vendor/lib/libc2d30-a3xx.so \
+            system/vendor/lib/libc2d30.so \
+            system/vendor/lib/libCB.so \
             system/lib/libchromatix_ov5693_common.so \
             system/lib/libchromatix_ov5693_default_video.so \
             system/lib/libchromatix_ov5693_preview.so \
@@ -131,11 +131,11 @@
             system/lib/libdsucsd.so \
             system/lib/libdsutils.so \
             system/lib/libgps.utils.so \
-            system/lib/libgsl.so \
+            system/vendor/lib/libgsl.so \
             system/lib/libI420colorconvert.so \
             system/lib/libidl.so \
-            system/lib/libllvm-qcom.so \
-            system/lib/libbccQTI.so \
+            system/vendor/lib/libllvm-qcom.so \
+            system/vendor/lib/libbccQTI.so \
             system/lib/libloc_core.so \
             system/lib/libloc_eng.so \
             system/lib/libmm-abl.so \
@@ -158,10 +158,10 @@
             system/lib/libqmiservices.so \
             system/lib/libqmi.so \
             system/lib/libQSEEComAPI.so \
-            system/lib/librs_adreno_sha1.so \
-            system/lib/librs_adreno.so \
-            system/lib/libRSDriver_adreno.so \
-            system/lib/libsc-a3xx.so \
+            system/vendor/lib/librs_adreno_sha1.so \
+            system/vendor/lib/librs_adreno.so \
+            system/vendor/lib/libRSDriver_adreno.so \
+            system/vendor/lib/libsc-a3xx.so \
             system/lib/libsensor1.so \
             system/lib/libsensor_reg.so \
             system/lib/libsensor_user_cal.so \
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index fa6d0ca..99415ba 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -50,22 +50,22 @@
     vendor/qcom/flo/proprietary/vidcfw.elf:system/etc/firmware/vidcfw.elf:qcom \
     vendor/qcom/flo/proprietary/vidc.mdt:system/etc/firmware/vidc.mdt:qcom \
     vendor/qcom/flo/proprietary/gps.conf:system/etc/gps.conf:qcom \
-    vendor/qcom/flo/proprietary/eglsubAndroid.so:system/lib/egl/eglsubAndroid.so:qcom \
-    vendor/qcom/flo/proprietary/libEGL_adreno.so:system/lib/egl/libEGL_adreno.so:qcom \
-    vendor/qcom/flo/proprietary/libGLESv1_CM_adreno.so:system/lib/egl/libGLESv1_CM_adreno.so:qcom \
-    vendor/qcom/flo/proprietary/libGLESv2_adreno.so:system/lib/egl/libGLESv2_adreno.so:qcom \
-    vendor/qcom/flo/proprietary/libplayback_adreno.so:system/lib/egl/libplayback_adreno.so:qcom \
-    vendor/qcom/flo/proprietary/libq3dtools_adreno.so:system/lib/egl/libq3dtools_adreno.so:qcom \
+    vendor/qcom/flo/proprietary/eglsubAndroid.so:system/vendor/lib/egl/eglsubAndroid.so:qcom \
+    vendor/qcom/flo/proprietary/libEGL_adreno.so:system/vendor/lib/egl/libEGL_adreno.so:qcom \
+    vendor/qcom/flo/proprietary/libGLESv1_CM_adreno.so:system/vendor/lib/egl/libGLESv1_CM_adreno.so:qcom \
+    vendor/qcom/flo/proprietary/libGLESv2_adreno.so:system/vendor/lib/egl/libGLESv2_adreno.so:qcom \
+    vendor/qcom/flo/proprietary/libplayback_adreno.so:system/vendor/lib/egl/libplayback_adreno.so:qcom \
+    vendor/qcom/flo/proprietary/libq3dtools_adreno.so:system/vendor/lib/egl/libq3dtools_adreno.so:qcom \
     vendor/qcom/flo/proprietary/flp.msm8960.so:system/lib/hw/flp.msm8960.so:qcom \
     vendor/qcom/flo/proprietary/gps.msm8960.so:system/lib/hw/gps.msm8960.so:qcom \
     vendor/qcom/flo/proprietary/sensors.msm8960.so:system/lib/hw/sensors.msm8960.so:qcom \
-    vendor/qcom/flo/proprietary/libadreno_utils.so:system/lib/libadreno_utils.so:qcom \
+    vendor/qcom/flo/proprietary/libadreno_utils.so:system/vendor/lib/libadreno_utils.so:qcom \
     vendor/qcom/flo/proprietary/libaudcal.so:system/lib/libaudcal.so:qcom \
     vendor/qcom/flo/proprietary/libaudioalsa.so:system/lib/libaudioalsa.so:qcom \
-    vendor/qcom/flo/proprietary/libC2D2.so:system/lib/libC2D2.so:qcom \
-    vendor/qcom/flo/proprietary/libc2d30-a3xx.so:system/lib/libc2d30-a3xx.so:qcom \
-    vendor/qcom/flo/proprietary/libc2d30.so:system/lib/libc2d30.so:qcom \
-    vendor/qcom/flo/proprietary/libCB.so:system/lib/libCB.so:qcom \
+    vendor/qcom/flo/proprietary/libC2D2.so:system/vendor/lib/libC2D2.so:qcom \
+    vendor/qcom/flo/proprietary/libc2d30-a3xx.so:system/vendor/lib/libc2d30-a3xx.so:qcom \
+    vendor/qcom/flo/proprietary/libc2d30.so:system/vendor/lib/libc2d30.so:qcom \
+    vendor/qcom/flo/proprietary/libCB.so:system/vendor/lib/libCB.so:qcom \
     vendor/qcom/flo/proprietary/libchromatix_ov5693_common.so:system/lib/libchromatix_ov5693_common.so:qcom \
     vendor/qcom/flo/proprietary/libchromatix_ov5693_default_video.so:system/lib/libchromatix_ov5693_default_video.so:qcom \
     vendor/qcom/flo/proprietary/libchromatix_ov5693_preview.so:system/lib/libchromatix_ov5693_preview.so:qcom \
@@ -82,11 +82,11 @@
     vendor/qcom/flo/proprietary/libdsucsd.so:system/lib/libdsucsd.so:qcom \
     vendor/qcom/flo/proprietary/libdsutils.so:system/lib/libdsutils.so:qcom \
     vendor/qcom/flo/proprietary/libgps.utils.so:system/lib/libgps.utils.so:qcom \
-    vendor/qcom/flo/proprietary/libgsl.so:system/lib/libgsl.so:qcom \
+    vendor/qcom/flo/proprietary/libgsl.so:system/vendor/lib/libgsl.so:qcom \
     vendor/qcom/flo/proprietary/libI420colorconvert.so:system/lib/libI420colorconvert.so:qcom \
     vendor/qcom/flo/proprietary/libidl.so:system/lib/libidl.so:qcom \
-    vendor/qcom/flo/proprietary/libllvm-qcom.so:system/lib/libllvm-qcom.so:qcom \
-    vendor/qcom/flo/proprietary/libbccQTI.so:system/lib/libbccQTI.so:qcom \
+    vendor/qcom/flo/proprietary/libllvm-qcom.so:system/vendor/lib/libllvm-qcom.so:qcom \
+    vendor/qcom/flo/proprietary/libbccQTI.so:system/vendor/lib/libbccQTI.so:qcom \
     vendor/qcom/flo/proprietary/libloc_core.so:system/lib/libloc_core.so:qcom \
     vendor/qcom/flo/proprietary/libloc_eng.so:system/lib/libloc_eng.so:qcom \
     vendor/qcom/flo/proprietary/libmm-abl.so:system/lib/libmm-abl.so:qcom \
@@ -109,10 +109,10 @@
     vendor/qcom/flo/proprietary/libqmiservices.so:system/lib/libqmiservices.so:qcom \
     vendor/qcom/flo/proprietary/libqmi.so:system/lib/libqmi.so:qcom \
     vendor/qcom/flo/proprietary/libQSEEComAPI.so:system/lib/libQSEEComAPI.so:qcom \
-    vendor/qcom/flo/proprietary/librs_adreno_sha1.so:system/lib/librs_adreno_sha1.so:qcom \
-    vendor/qcom/flo/proprietary/librs_adreno.so:system/lib/librs_adreno.so:qcom \
-    vendor/qcom/flo/proprietary/libRSDriver_adreno.so:system/lib/libRSDriver_adreno.so:qcom \
-    vendor/qcom/flo/proprietary/libsc-a3xx.so:system/lib/libsc-a3xx.so:qcom \
+    vendor/qcom/flo/proprietary/librs_adreno_sha1.so:system/vendor/lib/librs_adreno_sha1.so:qcom \
+    vendor/qcom/flo/proprietary/librs_adreno.so:system/vendor/lib/librs_adreno.so:qcom \
+    vendor/qcom/flo/proprietary/libRSDriver_adreno.so:system/vendor/lib/libRSDriver_adreno.so:qcom \
+    vendor/qcom/flo/proprietary/libsc-a3xx.so:system/vendor/lib/libsc-a3xx.so:qcom \
     vendor/qcom/flo/proprietary/libsensor1.so:system/lib/libsensor1.so:qcom \
     vendor/qcom/flo/proprietary/libsensor_reg.so:system/lib/libsensor_reg.so:qcom \
     vendor/qcom/flo/proprietary/libsensor_user_cal.so:system/lib/libsensor_user_cal.so:qcom \
diff --git a/vendor_owner_info.txt b/vendor_owner_info.txt
index 0e83153..858ef35 100644
--- a/vendor_owner_info.txt
+++ b/vendor_owner_info.txt
@@ -45,25 +45,25 @@
 system/bin/irsc_util:qcom
 system/bin/ks:qcom
 system/etc/gps.conf:qcom
-system/lib/egl/libEGL_adreno.so:qcom
-system/lib/egl/libGLESv1_CM_adreno.so:qcom
-system/lib/egl/libGLESv2_adreno.so:qcom
-system/lib/egl/libplayback_adreno.so:qcom
-system/lib/egl/libq3dtools_adreno.so:qcom
+system/vendor/lib/egl/libEGL_adreno.so:qcom
+system/vendor/lib/egl/libGLESv1_CM_adreno.so:qcom
+system/vendor/lib/egl/libGLESv2_adreno.so:qcom
+system/vendor/lib/egl/libplayback_adreno.so:qcom
+system/vendor/lib/egl/libq3dtools_adreno.so:qcom
 system/lib/libAKM.so:asus
-system/lib/libCB.so:qcom
+system/vendor/lib/libCB.so:qcom
 system/lib/libCommandSvc.so:qcom
 system/lib/libDxHdcp.so:qcom
 system/lib/libI420colorconvert.so:qcom
 system/lib/libQSEEComAPI.so:qcom
-system/lib/libRSDriver_adreno.so:qcom
+system/vendor/lib/libRSDriver_adreno.so:qcom
 system/lib/libacdbdata.so:asus
 system/lib/libacdbloader.so:qcom
-system/lib/libadreno_utils.so:qcom
+system/vendor/lib/libadreno_utils.so:qcom
 system/lib/libaudcal.so:qcom
 system/lib/libaudioalsa.so:qcom
-system/lib/libc2d30-a3xx.so:qcom
-system/lib/libc2d30.so:qcom
+system/vendor/lib/libc2d30-a3xx.so:qcom
+system/vendor/lib/libc2d30.so:qcom
 system/lib/libchromatix_ov5693_common.so:qcom
 system/lib/libchromatix_ov5693_default_video.so:qcom
 system/lib/libchromatix_ov5693_preview.so:qcom
@@ -109,8 +109,8 @@
 system/lib/libnetmgr.so:qcom
 system/vendor/lib/liboemcamera.so:qcom
 system/lib/liboemcrypto.so:qcom
-system/lib/librs_adreno_sha1.so:qcom
-system/lib/librs_adreno.so:qcom
+system/vendor/lib/librs_adreno_sha1.so:qcom
+system/vendor/lib/librs_adreno.so:qcom
 system/lib/libqcci_legacy.so:qcom
 system/lib/libqdi.so:qcom
 system/lib/libqdp.so:qcom
@@ -175,17 +175,17 @@
 system/vendor/firmware/a300_pm4.fw:qcom
 system/etc/debugger.conf:asus
 system/lib/egl/eglsubAndroid.so:qcom
-system/lib/libC2D2.so:qcom
+system/vendor/lib/libC2D2.so:qcom
 system/lib/egl/libEGL_adreno200.so:qcom
 system/lib/egl/libGLESv1_CM_adreno200.so:qcom
 system/lib/egl/libGLESv2_adreno200.so:qcom
 system/lib/libc2d2_a3xx.so:qcom
 system/lib/libdebugger_jni.so:asus
-system/lib/libgsl.so:qcom
-system/lib/libllvm-qcom.so:qcom
-system/lib/libbccQTI.so:qcom
+system/vendor/lib/libgsl.so:qcom
+system/vendor/lib/libllvm-qcom.so:qcom
+system/vendor/lib/libbccQTI.so:qcom
 system/lib/egl/libq3dtools_adreno200.so:qcom
-system/lib/libsc-a3xx.so:qcom
+system/vendor/lib/libsc-a3xx.so:qcom
 system/lib/libgeofence.so:qcom
 system/lib/libidl.so:qcom
 system/vendor/lib/libmmcamera2_c2d_module.so:qcom