diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3ff49ae..bc829b6 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -257,7 +257,7 @@ BOARD_AVB_ODM_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256
 
 # VINTF
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
-    $(DEVICE_PATH)/vintf/device_framework_matrix.xml \
+    $(DEVICE_PATH)/configs/vintf/device_framework_matrix.xml \
     hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \
     hardware/samsung/vintf/samsung_framework_compatibility_matrix.xml \
     vendor/lineage/config/device_framework_matrix.xml
@@ -265,8 +265,8 @@ DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml
 DEVICE_MANIFEST_FILE := \
     hardware/qcom-caf/sm8550/audio/primary-hal/configs/common/manifest_non_qmaa.xml \
     hardware/qcom-caf/sm8550/audio/primary-hal/configs/common/manifest_non_qmaa_extn.xml \
-    $(DEVICE_PATH)/vintf/manifest.xml \
-    $(DEVICE_PATH)/vintf/manifest_pineapple.xml \
+    $(DEVICE_PATH)/configs/vintf/manifest.xml \
+    $(DEVICE_PATH)/configs/vintf/manifest_pineapple.xml \
 
 # Wi-Fi
 BOARD_WLAN_DEVICE := qcwcn
diff --git a/vintf/device_framework_matrix.xml b/configs/vintf/device_framework_matrix.xml
similarity index 100%
rename from vintf/device_framework_matrix.xml
rename to configs/vintf/device_framework_matrix.xml
diff --git a/vintf/manifest.xml b/configs/vintf/manifest.xml
similarity index 100%
rename from vintf/manifest.xml
rename to configs/vintf/manifest.xml
diff --git a/vintf/manifest_pineapple.xml b/configs/vintf/manifest_pineapple.xml
similarity index 100%
rename from vintf/manifest_pineapple.xml
rename to configs/vintf/manifest_pineapple.xml
diff --git a/device.mk b/device.mk
index 48d1557..4891cd7 100644
--- a/device.mk
+++ b/device.mk
@@ -222,8 +222,13 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/fstab.qcom
 
-#PRODUCT_COPY_FILES += \
-#    $(LOCAL_PATH)/configs/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf
+# Sensors
+PRODUCT_PACKAGES += \
+    android.hardware.sensors-service.samsung-multihal \
+    sensors.dynamic_sensor_hal
+
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \