diff --git a/universal7885-common/configs/audio_effects.xml b/universal7885-common/configs/audio/audio_effects.xml
similarity index 100%
rename from universal7885-common/configs/audio_effects.xml
rename to universal7885-common/configs/audio/audio_effects.xml
diff --git a/universal7885-common/configs/audio_policy_configuration.xml b/universal7885-common/configs/audio/audio_policy_configuration.xml
similarity index 100%
rename from universal7885-common/configs/audio_policy_configuration.xml
rename to universal7885-common/configs/audio/audio_policy_configuration.xml
diff --git a/universal7885-common/configs/libnfc-nci.conf b/universal7885-common/configs/nfc/libnfc-nci.conf
similarity index 100%
rename from universal7885-common/configs/libnfc-nci.conf
rename to universal7885-common/configs/nfc/libnfc-nci.conf
diff --git a/universal7885-common/configs/libnfc-sec-vendor.conf b/universal7885-common/configs/nfc/libnfc-sec-vendor.conf
similarity index 100%
rename from universal7885-common/configs/libnfc-sec-vendor.conf
rename to universal7885-common/configs/nfc/libnfc-sec-vendor.conf
diff --git a/universal7885-common/configs/nfcee_access.xml b/universal7885-common/configs/nfc/nfcee_access.xml
similarity index 100%
rename from universal7885-common/configs/nfcee_access.xml
rename to universal7885-common/configs/nfc/nfcee_access.xml
diff --git a/universal7885-common/configs/p2p_supplicant_overlay.conf b/universal7885-common/configs/wifi/p2p_supplicant_overlay.conf
similarity index 100%
rename from universal7885-common/configs/p2p_supplicant_overlay.conf
rename to universal7885-common/configs/wifi/p2p_supplicant_overlay.conf
diff --git a/universal7885-common/configs/wpa_supplicant.conf b/universal7885-common/configs/wifi/wpa_supplicant.conf
similarity index 100%
rename from universal7885-common/configs/wpa_supplicant.conf
rename to universal7885-common/configs/wifi/wpa_supplicant.conf
diff --git a/universal7885-common/configs/wpa_supplicant_overlay.conf b/universal7885-common/configs/wifi/wpa_supplicant_overlay.conf
similarity index 100%
rename from universal7885-common/configs/wpa_supplicant_overlay.conf
rename to universal7885-common/configs/wifi/wpa_supplicant_overlay.conf
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 23ab9bc..fe922d5 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -27,8 +27,8 @@ PRODUCT_COPY_FILES += \
     frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
     frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
-    $(LOCAL_PATH)/configs/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
-    $(LOCAL_PATH)/configs/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml
+    $(LOCAL_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+    $(LOCAL_PATH)/configs/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml
 
 # Bluetooth
 PRODUCT_PACKAGES += \
@@ -143,11 +143,9 @@ PRODUCT_PACKAGES += \
     Tag
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/libnfc-sec-vendor.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-sec-vendor.conf
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \
-    $(LOCAL_PATH)/configs/nfcee_access.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/nfcee_access.xml
+    $(LOCAL_PATH)/configs/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \
+    $(LOCAL_PATH)/configs/nfc/nfcee_access.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/nfcee_access.xml \
+    $(LOCAL_PATH)/configs/nfc/libnfc-sec-vendor.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-sec-vendor.conf
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
@@ -279,9 +277,9 @@ PRODUCT_PACKAGES += \
     wpa_supplicant
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
-    $(LOCAL_PATH)/configs/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \
-    $(LOCAL_PATH)/configs/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
+    $(LOCAL_PATH)/configs/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
+    $(LOCAL_PATH)/configs/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \
+    $(LOCAL_PATH)/configs/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
     
 PRODUCT_CFI_INCLUDE_PATHS += hardware/samsung_slsi/scsc_wifibt/wpa_supplicant_lib