diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 940d6a1..98a6a18 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -57,7 +57,7 @@ TARGET_BOOTLOADER_BOARD_NAME := holi
 TARGET_NO_BOOTLOADER := true
 
 # Filesystem
-TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs
+TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/configs/config.fs
 
 # FM
 AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true
@@ -68,14 +68,6 @@ BOARD_HAVE_QCOM_FM := true
 BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default
 LOC_HIDL_VERSION := 4.0
 
-# HIDL
-DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml
-DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml
-
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
-    $(COMMON_PATH)/framework_compatibility_matrix.xml \
-    vendor/lineage/config/device_framework_matrix.xml
-
 # Kernel
 BOARD_INCLUDE_DTB_IN_BOOTIMG := true
 BOARD_KERNEL_BASE := 0x00000000
@@ -164,11 +156,11 @@ BOARD_USES_QCOM_HARDWARE := true
 TARGET_BOARD_PLATFORM := holi
 
 # Properties
-TARGET_ODM_PROP += $(COMMON_PATH)/odm.prop
-TARGET_PRODUCT_PROP += $(COMMON_PATH)/product.prop
-TARGET_SYSTEM_EXT_PROP += $(COMMON_PATH)/system_ext.prop
-TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop
-TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop
+TARGET_ODM_PROP += $(COMMON_PATH)/properties/odm.prop
+TARGET_PRODUCT_PROP += $(COMMON_PATH)/properties/product.prop
+TARGET_SYSTEM_EXT_PROP += $(COMMON_PATH)/properties/system_ext.prop
+TARGET_SYSTEM_PROP += $(COMMON_PATH)/properties/system.prop
+TARGET_VENDOR_PROP += $(COMMON_PATH)/properties/vendor.prop
 
 # Power
 TARGET_TAP_TO_WAKE_NODE := "/proc/tp_gesture"
@@ -213,6 +205,14 @@ BOARD_AVB_RECOVERY_ALGORITHM := SHA256_RSA4096
 BOARD_AVB_RECOVERY_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
 BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION := 1
 
+# VINTF
+DEVICE_MATRIX_FILE := $(COMMON_PATH)/vintf/compatibility_matrix.xml
+DEVICE_MANIFEST_FILE := $(COMMON_PATH)/vintf/manifest.xml
+
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
+    $(COMMON_PATH)/vintf/framework_compatibility_matrix.xml \
+    vendor/lineage/config/device_framework_matrix.xml
+
 # WiFi
 BOARD_WLAN_DEVICE := qcwcn
 BOARD_HOSTAPD_DRIVER := NL80211
diff --git a/config.fs b/configs/config.fs
similarity index 100%
rename from config.fs
rename to configs/config.fs
diff --git a/holi.mk b/holi.mk
index cd98c3e..c76e96c 100644
--- a/holi.mk
+++ b/holi.mk
@@ -350,7 +350,7 @@ PRODUCT_PACKAGES += \
     RcsService
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/telephony_system-ext_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephony_system-ext-privapp-permissions-qti.xml
+    $(LOCAL_PATH)/permissions/telephony_system-ext_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephony_system-ext-privapp-permissions-qti.xml
 
 # RenderScript HAL
 PRODUCT_PACKAGES += \
diff --git a/configs/telephony_system-ext_privapp-permissions-qti.xml b/permissions/telephony_system-ext_privapp-permissions-qti.xml
similarity index 100%
rename from configs/telephony_system-ext_privapp-permissions-qti.xml
rename to permissions/telephony_system-ext_privapp-permissions-qti.xml
diff --git a/odm.prop b/properties/odm.prop
similarity index 100%
rename from odm.prop
rename to properties/odm.prop
diff --git a/product.prop b/properties/product.prop
similarity index 100%
rename from product.prop
rename to properties/product.prop
diff --git a/system.prop b/properties/system.prop
similarity index 100%
rename from system.prop
rename to properties/system.prop
diff --git a/system_ext.prop b/properties/system_ext.prop
similarity index 100%
rename from system_ext.prop
rename to properties/system_ext.prop
diff --git a/vendor.prop b/properties/vendor.prop
similarity index 100%
rename from vendor.prop
rename to properties/vendor.prop
diff --git a/compatibility_matrix.xml b/vintf/compatibility_matrix.xml
similarity index 100%
rename from compatibility_matrix.xml
rename to vintf/compatibility_matrix.xml
diff --git a/framework_compatibility_matrix.xml b/vintf/framework_compatibility_matrix.xml
similarity index 100%
rename from framework_compatibility_matrix.xml
rename to vintf/framework_compatibility_matrix.xml
diff --git a/manifest.xml b/vintf/manifest.xml
similarity index 100%
rename from manifest.xml
rename to vintf/manifest.xml