diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index be6e4c7..97b8d3d 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -96,24 +96,24 @@ BOARD_KERNEL_CMDLINE += ip6table_raw.raw_before_defrag=1
 BOARD_KERNEL_CMDLINE += video=vfb:640x400,bpp=32,memsize=3072000
 
 # HIDL
-DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml
+DEVICE_MATRIX_FILE := $(COMMON_PATH)/hidl/compatibility_matrix.xml
 
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
-    $(COMMON_PATH)/framework_compatibility_matrix.xml \
+    $(COMMON_PATH)/hidl/framework_compatibility_matrix.xml \
     vendor/lineage/config/device_framework_matrix.xml
 
 DEVICE_MANIFEST_FILE := \
-    $(COMMON_PATH)/manifests/manifest_lahaina.xml \
-    $(COMMON_PATH)/manifests/AHBF@2.1-service.xml \
-    $(COMMON_PATH)/manifests/android.hardware.atrace@1.0-service.xml \
-    $(COMMON_PATH)/manifests/android.hardware.gnss@2.1-service-qti.xml \
-    $(COMMON_PATH)/manifests/android.hardware.neuralnetworks@1.3-service-qti.xml \
-    $(COMMON_PATH)/manifests/c2_manifest_vendor.xml \
-    $(COMMON_PATH)/manifests/fod.xml \
-    $(COMMON_PATH)/manifests/manifest_android.hardware.drm@1.3-service.widevine.xml \
-    $(COMMON_PATH)/manifests/vendor.qti.diag.hal.service.xml \
-    $(COMMON_PATH)/manifests/vendor.qti.gnss@4.0-service.xml \
-    $(COMMON_PATH)/manifests/vendor.qti.hardware.servicetracker@1.2-service.xml
+    $(COMMON_PATH)/hidl/manifest_lahaina.xml \
+    $(COMMON_PATH)/hidl/AHBF@2.1-service.xml \
+    $(COMMON_PATH)/hidl/android.hardware.atrace@1.0-service.xml \
+    $(COMMON_PATH)/hidl/android.hardware.gnss@2.1-service-qti.xml \
+    $(COMMON_PATH)/hidl/android.hardware.neuralnetworks@1.3-service-qti.xml \
+    $(COMMON_PATH)/hidl/c2_manifest_vendor.xml \
+    $(COMMON_PATH)/hidl/fod.xml \
+    $(COMMON_PATH)/hidl/manifest_android.hardware.drm@1.3-service.widevine.xml \
+    $(COMMON_PATH)/hidl/vendor.qti.diag.hal.service.xml \
+    $(COMMON_PATH)/hidl/vendor.qti.gnss@4.0-service.xml \
+    $(COMMON_PATH)/hidl/vendor.qti.hardware.servicetracker@1.2-service.xml
 
 # Partitions
 BOARD_FLASH_BLOCK_SIZE := 131072
diff --git a/manifests/AHBF@2.1-service.xml b/hidl/AHBF@2.1-service.xml
similarity index 100%
rename from manifests/AHBF@2.1-service.xml
rename to hidl/AHBF@2.1-service.xml
diff --git a/manifests/android.hardware.atrace@1.0-service.xml b/hidl/android.hardware.atrace@1.0-service.xml
similarity index 100%
rename from manifests/android.hardware.atrace@1.0-service.xml
rename to hidl/android.hardware.atrace@1.0-service.xml
diff --git a/manifests/android.hardware.boot@1.1.xml b/hidl/android.hardware.boot@1.1.xml
similarity index 100%
rename from manifests/android.hardware.boot@1.1.xml
rename to hidl/android.hardware.boot@1.1.xml
diff --git a/manifests/android.hardware.gnss@2.1-service-qti.xml b/hidl/android.hardware.gnss@2.1-service-qti.xml
similarity index 100%
rename from manifests/android.hardware.gnss@2.1-service-qti.xml
rename to hidl/android.hardware.gnss@2.1-service-qti.xml
diff --git a/manifests/android.hardware.neuralnetworks@1.3-service-qti.xml b/hidl/android.hardware.neuralnetworks@1.3-service-qti.xml
similarity index 100%
rename from manifests/android.hardware.neuralnetworks@1.3-service-qti.xml
rename to hidl/android.hardware.neuralnetworks@1.3-service-qti.xml
diff --git a/manifests/c2_manifest_vendor.xml b/hidl/c2_manifest_vendor.xml
similarity index 100%
rename from manifests/c2_manifest_vendor.xml
rename to hidl/c2_manifest_vendor.xml
diff --git a/compatibility_matrix.xml b/hidl/compatibility_matrix.xml
similarity index 100%
rename from compatibility_matrix.xml
rename to hidl/compatibility_matrix.xml
diff --git a/manifests/fod.xml b/hidl/fod.xml
similarity index 100%
rename from manifests/fod.xml
rename to hidl/fod.xml
diff --git a/framework_compatibility_matrix.xml b/hidl/framework_compatibility_matrix.xml
similarity index 100%
rename from framework_compatibility_matrix.xml
rename to hidl/framework_compatibility_matrix.xml
diff --git a/manifests/manifest_android.hardware.drm@1.3-service.widevine.xml b/hidl/manifest_android.hardware.drm@1.3-service.widevine.xml
similarity index 100%
rename from manifests/manifest_android.hardware.drm@1.3-service.widevine.xml
rename to hidl/manifest_android.hardware.drm@1.3-service.widevine.xml
diff --git a/manifests/manifest_lahaina.xml b/hidl/manifest_lahaina.xml
similarity index 100%
rename from manifests/manifest_lahaina.xml
rename to hidl/manifest_lahaina.xml
diff --git a/manifests/vendor.qti.diag.hal.service.xml b/hidl/vendor.qti.diag.hal.service.xml
similarity index 100%
rename from manifests/vendor.qti.diag.hal.service.xml
rename to hidl/vendor.qti.diag.hal.service.xml
diff --git a/manifests/vendor.qti.gnss@4.0-service.xml b/hidl/vendor.qti.gnss@4.0-service.xml
similarity index 100%
rename from manifests/vendor.qti.gnss@4.0-service.xml
rename to hidl/vendor.qti.gnss@4.0-service.xml
diff --git a/manifests/vendor.qti.hardware.servicetracker@1.2-service.xml b/hidl/vendor.qti.hardware.servicetracker@1.2-service.xml
similarity index 100%
rename from manifests/vendor.qti.hardware.servicetracker@1.2-service.xml
rename to hidl/vendor.qti.hardware.servicetracker@1.2-service.xml