diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2ecdec8..5d0f42e 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -167,6 +167,10 @@ TARGET_PROVIDES_KEYMASTER := true
 # Lights
 TARGET_PROVIDES_LIBLIGHT := true
 
+# Manifest
+DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/configs/manifest.xml
+DEVICE_MATRIX_FILE   := $(DEVICE_PATH)/configs/compatibility_matrix.xml
+
 # Media
 # TARGET_USES_MEDIA_EXTENSIONS := true
 
diff --git a/compatibility_matrix.xml b/configs/compatibility_matrix.xml
similarity index 100%
rename from compatibility_matrix.xml
rename to configs/compatibility_matrix.xml
diff --git a/manifest.xml b/configs/manifest.xml
similarity index 100%
rename from manifest.xml
rename to configs/manifest.xml
diff --git a/device.mk b/device.mk
index 7ae3435..c6ea35a 100644
--- a/device.mk
+++ b/device.mk
@@ -191,11 +191,6 @@ PRODUCT_PACKAGES += \
     libloc_api-rpc-qc \
     libshims_get_process_name
 
-# HIDL
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/manifest.xml:system/vendor/manifest.xml \
-    $(LOCAL_PATH)/compatibility_matrix.xml:system/vendor/compatibility_matrix.xml
-
 # IMS
 PRODUCT_PACKAGES += \
     libshim_ims