diff --git a/audio/audio_platform_info.xml b/configs/audio/audio_platform_info.xml
similarity index 100%
rename from audio/audio_platform_info.xml
rename to configs/audio/audio_platform_info.xml
diff --git a/audio/audio_policy_configuration.xml b/configs/audio/audio_policy_configuration.xml
similarity index 100%
rename from audio/audio_policy_configuration.xml
rename to configs/audio/audio_policy_configuration.xml
diff --git a/audio/audio_policy_configuration_a2dp_offload_disabled.xml b/configs/audio/audio_policy_configuration_a2dp_offload_disabled.xml
similarity index 100%
rename from audio/audio_policy_configuration_a2dp_offload_disabled.xml
rename to configs/audio/audio_policy_configuration_a2dp_offload_disabled.xml
diff --git a/audio/bluetooth_hearing_aid_audio_policy_configuration.xml b/configs/audio/bluetooth_hearing_aid_audio_policy_configuration.xml
similarity index 100%
rename from audio/bluetooth_hearing_aid_audio_policy_configuration.xml
rename to configs/audio/bluetooth_hearing_aid_audio_policy_configuration.xml
diff --git a/audio/mixer_paths.xml b/configs/audio/mixer_paths.xml
similarity index 100%
rename from audio/mixer_paths.xml
rename to configs/audio/mixer_paths.xml
diff --git a/audio/sound_trigger_mixer_paths.xml b/configs/audio/sound_trigger_mixer_paths.xml
similarity index 100%
rename from audio/sound_trigger_mixer_paths.xml
rename to configs/audio/sound_trigger_mixer_paths.xml
diff --git a/media/media_profiles_holi.xml b/configs/media/media_profiles_holi.xml
similarity index 100%
rename from media/media_profiles_holi.xml
rename to configs/media/media_profiles_holi.xml
diff --git a/nfc/libnfc-hal-st.conf b/configs/nfc/libnfc-hal-st.conf
similarity index 100%
rename from nfc/libnfc-hal-st.conf
rename to configs/nfc/libnfc-hal-st.conf
diff --git a/configs/task_profiles.json b/configs/perf/task_profiles.json
similarity index 100%
rename from configs/task_profiles.json
rename to configs/perf/task_profiles.json
diff --git a/configs/privapp-permissions-hotword.xml b/configs/permissions/privapp-permissions-hotword.xml
similarity index 100%
rename from configs/privapp-permissions-hotword.xml
rename to configs/permissions/privapp-permissions-hotword.xml
diff --git a/device.mk b/device.mk
index 8d41eec..272de11 100644
--- a/device.mk
+++ b/device.mk
@@ -66,11 +66,11 @@ PRODUCT_COPY_FILES += \
     $(AUDIO_HAL_DIR)/configs/holi/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \
     $(AUDIO_HAL_DIR)/configs/holi/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \
     $(AUDIO_HAL_DIR)/configs/holi/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml  \
-    $(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
-    $(LOCAL_PATH)/audio/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml \
-    $(LOCAL_PATH)/audio/bluetooth_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_hearing_aid_audio_policy_configuration.xml \
-    $(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \
-    $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml
+    $(LOCAL_PATH)/configs/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
+    $(LOCAL_PATH)/configs/audio/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml \
+    $(LOCAL_PATH)/configs/audio/bluetooth_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_hearing_aid_audio_policy_configuration.xml \
+    $(LOCAL_PATH)/configs/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \
+    $(LOCAL_PATH)/configs/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml
 
 PRODUCT_COPY_FILES += \
     frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/audio_policy_volumes.xml \
@@ -174,7 +174,7 @@ PRODUCT_PACKAGES += \
 
 # Hotword enrollment
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-hotword.xml
+    $(LOCAL_PATH)/configs/permissions/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-hotword.xml
 
 # Init
 PRODUCT_PACKAGES += \
@@ -216,7 +216,7 @@ $(call soong_config_set,OPLUS_LINEAGE_LIVEDISPLAY_HAL,ENABLE_SE,false)
 
 # Media
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/media/media_profiles_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
+    $(LOCAL_PATH)/configs/media/media_profiles_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
 
 $(call soong_config_set,stagefright,target_disable_thumbnail_block_model,true)
 
@@ -228,7 +228,7 @@ PRODUCT_PACKAGES += \
     Tag
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \
+    $(LOCAL_PATH)/configs/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \
     frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \
     frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \
     frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml
@@ -261,7 +261,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
 
 # Perf
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json
+    $(LOCAL_PATH)/configs/perf/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json
 
 # Power
 PRODUCT_PACKAGES += \