diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 59bf086..faf3962 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -70,8 +70,8 @@ TARGET_LINUX_KERNEL_VERSION := 3.18
 TARGET_KERNEL_SOURCE := kernel/samsung/exynos7870
 
 # HIDL
-DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/manifest.xml
-DEVICE_MATRIX_FILE := $(LOCAL_PATH)/compatibility_matrix.xml
+DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/configs/manifest.xml
+DEVICE_MATRIX_FILE := $(LOCAL_PATH)/configs/compatibility_matrix.xml
 
 # Use these flags if the board has a ext4 partition larger than 2gb
 BOARD_HAS_LARGE_FILESYSTEM := 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 99%
rename from manifest.xml
rename to configs/manifest.xml
index 6b35bdf..a1d5495 100644
--- a/manifest.xml
+++ b/configs/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="3">
+<manifest version="1.0" type="device" target-level="2">
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>