diff --git a/configs/audio/audio_effects.xml b/audio/audio_effects.xml
similarity index 100%
rename from configs/audio/audio_effects.xml
rename to audio/audio_effects.xml
diff --git a/configs/audio/audio_output_policy.conf b/audio/audio_output_policy.conf
similarity index 100%
rename from configs/audio/audio_output_policy.conf
rename to audio/audio_output_policy.conf
diff --git a/configs/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
similarity index 100%
rename from configs/audio/audio_policy_configuration.xml
rename to audio/audio_policy_configuration.xml
diff --git a/configs/audio/audio_tuning_mixer.txt b/audio/audio_tuning_mixer.txt
similarity index 100%
rename from configs/audio/audio_tuning_mixer.txt
rename to audio/audio_tuning_mixer.txt
diff --git a/configs/audio/impl/Android.bp b/audio/impl/Android.bp
similarity index 100%
rename from configs/audio/impl/Android.bp
rename to audio/impl/Android.bp
diff --git a/configs/audio/impl/Conversions.cpp b/audio/impl/Conversions.cpp
similarity index 100%
rename from configs/audio/impl/Conversions.cpp
rename to audio/impl/Conversions.cpp
diff --git a/configs/audio/impl/Device.cpp b/audio/impl/Device.cpp
similarity index 100%
rename from configs/audio/impl/Device.cpp
rename to audio/impl/Device.cpp
diff --git a/configs/audio/impl/DevicesFactory.cpp b/audio/impl/DevicesFactory.cpp
similarity index 100%
rename from configs/audio/impl/DevicesFactory.cpp
rename to audio/impl/DevicesFactory.cpp
diff --git a/configs/audio/impl/ParametersUtil.cpp b/audio/impl/ParametersUtil.cpp
similarity index 100%
rename from configs/audio/impl/ParametersUtil.cpp
rename to audio/impl/ParametersUtil.cpp
diff --git a/configs/audio/impl/PrimaryDevice.cpp b/audio/impl/PrimaryDevice.cpp
similarity index 100%
rename from configs/audio/impl/PrimaryDevice.cpp
rename to audio/impl/PrimaryDevice.cpp
diff --git a/configs/audio/impl/Stream.cpp b/audio/impl/Stream.cpp
similarity index 100%
rename from configs/audio/impl/Stream.cpp
rename to audio/impl/Stream.cpp
diff --git a/configs/audio/impl/StreamIn.cpp b/audio/impl/StreamIn.cpp
similarity index 100%
rename from configs/audio/impl/StreamIn.cpp
rename to audio/impl/StreamIn.cpp
diff --git a/configs/audio/impl/StreamOut.cpp b/audio/impl/StreamOut.cpp
similarity index 100%
rename from configs/audio/impl/StreamOut.cpp
rename to audio/impl/StreamOut.cpp
diff --git a/configs/audio/impl/include/core/default/Conversions.h b/audio/impl/include/core/default/Conversions.h
similarity index 100%
rename from configs/audio/impl/include/core/default/Conversions.h
rename to audio/impl/include/core/default/Conversions.h
diff --git a/configs/audio/impl/include/core/default/Device.h b/audio/impl/include/core/default/Device.h
similarity index 100%
rename from configs/audio/impl/include/core/default/Device.h
rename to audio/impl/include/core/default/Device.h
diff --git a/configs/audio/impl/include/core/default/DevicesFactory.h b/audio/impl/include/core/default/DevicesFactory.h
similarity index 100%
rename from configs/audio/impl/include/core/default/DevicesFactory.h
rename to audio/impl/include/core/default/DevicesFactory.h
diff --git a/configs/audio/impl/include/core/default/ParametersUtil.h b/audio/impl/include/core/default/ParametersUtil.h
similarity index 100%
rename from configs/audio/impl/include/core/default/ParametersUtil.h
rename to audio/impl/include/core/default/ParametersUtil.h
diff --git a/configs/audio/impl/include/core/default/PrimaryDevice.h b/audio/impl/include/core/default/PrimaryDevice.h
similarity index 100%
rename from configs/audio/impl/include/core/default/PrimaryDevice.h
rename to audio/impl/include/core/default/PrimaryDevice.h
diff --git a/configs/audio/impl/include/core/default/Stream.h b/audio/impl/include/core/default/Stream.h
similarity index 100%
rename from configs/audio/impl/include/core/default/Stream.h
rename to audio/impl/include/core/default/Stream.h
diff --git a/configs/audio/impl/include/core/default/StreamIn.h b/audio/impl/include/core/default/StreamIn.h
similarity index 100%
rename from configs/audio/impl/include/core/default/StreamIn.h
rename to audio/impl/include/core/default/StreamIn.h
diff --git a/configs/audio/impl/include/core/default/StreamOut.h b/audio/impl/include/core/default/StreamOut.h
similarity index 100%
rename from configs/audio/impl/include/core/default/StreamOut.h
rename to audio/impl/include/core/default/StreamOut.h
diff --git a/configs/audio/impl/include/core/default/Util.h b/audio/impl/include/core/default/Util.h
similarity index 100%
rename from configs/audio/impl/include/core/default/Util.h
rename to audio/impl/include/core/default/Util.h
diff --git a/configs/audio/listen_platform_info.xml b/audio/listen_platform_info.xml
similarity index 100%
rename from configs/audio/listen_platform_info.xml
rename to audio/listen_platform_info.xml
diff --git a/configs/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml
similarity index 100%
rename from configs/audio/sound_trigger_mixer_paths.xml
rename to audio/sound_trigger_mixer_paths.xml
diff --git a/configs/audio/sound_trigger_mixer_paths_wcd9330.xml b/audio/sound_trigger_mixer_paths_wcd9330.xml
similarity index 100%
rename from configs/audio/sound_trigger_mixer_paths_wcd9330.xml
rename to audio/sound_trigger_mixer_paths_wcd9330.xml
diff --git a/configs/audio/sound_trigger_platform_info.xml b/audio/sound_trigger_platform_info.xml
similarity index 100%
rename from configs/audio/sound_trigger_platform_info.xml
rename to audio/sound_trigger_platform_info.xml
diff --git a/configs/data/dsi_config.xml b/data/dsi_config.xml
similarity index 100%
rename from configs/data/dsi_config.xml
rename to data/dsi_config.xml
diff --git a/configs/data/netmgr_config.xml b/data/netmgr_config.xml
similarity index 100%
rename from configs/data/netmgr_config.xml
rename to data/netmgr_config.xml
diff --git a/configs/data/qmi_config.xml b/data/qmi_config.xml
similarity index 100%
rename from configs/data/qmi_config.xml
rename to data/qmi_config.xml
diff --git a/device.mk b/device.mk
index d50c1ac..cf862a7 100755
--- a/device.mk
+++ b/device.mk
@@ -77,9 +77,9 @@ PRODUCT_COPY_FILES += \
 
 # QMI
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/data/dsi_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/dsi_config.xml \
-    $(LOCAL_PATH)/configs/data/netmgr_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/netmgr_config.xml \
-    $(LOCAL_PATH)/configs/data/qmi_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/qmi_config.xml
+    $(LOCAL_PATH)/data/dsi_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/dsi_config.xml \
+    $(LOCAL_PATH)/data/netmgr_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/netmgr_config.xml \
+    $(LOCAL_PATH)/data/qmi_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/qmi_config.xml
 
 # QCOM
 PRODUCT_COPY_FILES += \
@@ -120,14 +120,14 @@ PRODUCT_PACKAGES += \
     libvolumelistener
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
-    $(LOCAL_PATH)/configs/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \
-    $(LOCAL_PATH)/configs/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \
-    $(LOCAL_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
-    $(LOCAL_PATH)/configs/audio/listen_platform_info.xml:system/etc/listen_platform_info.xml \
-    $(LOCAL_PATH)/configs/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \
-    $(LOCAL_PATH)/configs/audio/sound_trigger_mixer_paths_wcd9330.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9330.xml \
-    $(LOCAL_PATH)/configs/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml
+    $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
+    $(LOCAL_PATH)/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \
+    $(LOCAL_PATH)/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \
+    $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+    $(LOCAL_PATH)/audio/listen_platform_info.xml:system/etc/listen_platform_info.xml \
+    $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \
+    $(LOCAL_PATH)/audio/sound_trigger_mixer_paths_wcd9330.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9330.xml \
+    $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml
 
 PRODUCT_COPY_FILES += \
     frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \
@@ -166,8 +166,8 @@ PRODUCT_PACKAGES += \
     libtinyxml
 
 PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/configs/display/hdr_tm_config.xml:$(TARGET_COPY_OUT_VENDOR)/vendor/etc/hdr_tm_config.xml \
-	$(LOCAL_PATH)/configs/display/qdcm_calib_data_ss_dsi_panel_ANA38401_AMS968HH01_QXGA.xml:$(TARGET_COPY_OUT_VENDOR)/vendor/etc/qdcm_calib_data_ss_dsi_panel_ANA38401_AMS968HH01_QXGA.xml
+	$(LOCAL_PATH)/display/hdr_tm_config.xml:$(TARGET_COPY_OUT_VENDOR)/vendor/etc/hdr_tm_config.xml \
+	$(LOCAL_PATH)/display/qdcm_calib_data_ss_dsi_panel_ANA38401_AMS968HH01_QXGA.xml:$(TARGET_COPY_OUT_VENDOR)/vendor/etc/qdcm_calib_data_ss_dsi_panel_ANA38401_AMS968HH01_QXGA.xml
 
 # Doze mode
 PRODUCT_PACKAGES += \
@@ -243,16 +243,16 @@ PRODUCT_PACKAGES += \
 
 # Keylayout
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/keylayout/gpio-keys.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/gpio-keys.kl \
-    $(LOCAL_PATH)/configs/keylayout/sec_e-pen.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/sec_e-pen.kl \
-    $(LOCAL_PATH)/configs/keylayout/sec_touchkey.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/sec_touchkey.kl \
-    $(LOCAL_PATH)/configs/keylayout/synaptics_dsx.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/synaptics_dsx.kl \
-    $(LOCAL_PATH)/configs/keylayout/Tab_S3_Book_Cover_Keyboard.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Tab_S3_Book_Cover_Keyboard.kl \
+    $(LOCAL_PATH)/keylayout/gpio-keys.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/gpio-keys.kl \
+    $(LOCAL_PATH)/keylayout/sec_e-pen.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/sec_e-pen.kl \
+    $(LOCAL_PATH)/keylayout/sec_touchkey.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/sec_touchkey.kl \
+    $(LOCAL_PATH)/keylayout/synaptics_dsx.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/synaptics_dsx.kl \
+    $(LOCAL_PATH)/keylayout/Tab_S3_Book_Cover_Keyboard.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Tab_S3_Book_Cover_Keyboard.kl \
 
 # idc
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/idc/sec_e-pen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/sec_e-pen.idc \
-    $(LOCAL_PATH)/configs/idc/Tab_S3_Book_Cover_Keyboard.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/Tab_S3_Book_Cover_Keyboard.idc
+    $(LOCAL_PATH)/idc/sec_e-pen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/sec_e-pen.idc \
+    $(LOCAL_PATH)/idc/Tab_S3_Book_Cover_Keyboard.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/Tab_S3_Book_Cover_Keyboard.idc
 
 # Keymaster
 PRODUCT_PACKAGES += \
@@ -269,11 +269,11 @@ PRODUCT_PACKAGES += \
 
 # Media
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
-    $(LOCAL_PATH)/configs/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
-    $(LOCAL_PATH)/configs/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
-    $(LOCAL_PATH)/configs/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \
-    $(LOCAL_PATH)/configs/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml
+    $(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
+    $(LOCAL_PATH)/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
+    $(LOCAL_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
+    $(LOCAL_PATH)/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \
+    $(LOCAL_PATH)/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml
 
 PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
diff --git a/configs/display/hdr_tm_config.xml b/display/hdr_tm_config.xml
similarity index 100%
rename from configs/display/hdr_tm_config.xml
rename to display/hdr_tm_config.xml
diff --git a/configs/display/qdcm_calib_data_ss_dsi_panel_ANA38401_AMS968HH01_QXGA.xml b/display/qdcm_calib_data_ss_dsi_panel_ANA38401_AMS968HH01_QXGA.xml
similarity index 100%
rename from configs/display/qdcm_calib_data_ss_dsi_panel_ANA38401_AMS968HH01_QXGA.xml
rename to display/qdcm_calib_data_ss_dsi_panel_ANA38401_AMS968HH01_QXGA.xml
diff --git a/configs/idc/Tab_S3_Book_Cover_Keyboard.idc b/idc/Tab_S3_Book_Cover_Keyboard.idc
similarity index 100%
rename from configs/idc/Tab_S3_Book_Cover_Keyboard.idc
rename to idc/Tab_S3_Book_Cover_Keyboard.idc
diff --git a/configs/idc/sec_e-pen.idc b/idc/sec_e-pen.idc
similarity index 100%
rename from configs/idc/sec_e-pen.idc
rename to idc/sec_e-pen.idc
diff --git a/configs/keylayout/Tab_S3_Book_Cover_Keyboard.kl b/keylayout/Tab_S3_Book_Cover_Keyboard.kl
similarity index 100%
rename from configs/keylayout/Tab_S3_Book_Cover_Keyboard.kl
rename to keylayout/Tab_S3_Book_Cover_Keyboard.kl
diff --git a/configs/keylayout/gpio-keys.kl b/keylayout/gpio-keys.kl
similarity index 100%
rename from configs/keylayout/gpio-keys.kl
rename to keylayout/gpio-keys.kl
diff --git a/configs/keylayout/sec_e-pen.kl b/keylayout/sec_e-pen.kl
similarity index 100%
rename from configs/keylayout/sec_e-pen.kl
rename to keylayout/sec_e-pen.kl
diff --git a/configs/keylayout/sec_touchkey.kl b/keylayout/sec_touchkey.kl
similarity index 100%
rename from configs/keylayout/sec_touchkey.kl
rename to keylayout/sec_touchkey.kl
diff --git a/configs/keylayout/synaptics_dsx.kl b/keylayout/synaptics_dsx.kl
similarity index 100%
rename from configs/keylayout/synaptics_dsx.kl
rename to keylayout/synaptics_dsx.kl
diff --git a/configs/media/media_codecs.xml b/media/media_codecs.xml
similarity index 100%
rename from configs/media/media_codecs.xml
rename to media/media_codecs.xml
diff --git a/configs/media/media_codecs_performance.xml b/media/media_codecs_performance.xml
similarity index 100%
rename from configs/media/media_codecs_performance.xml
rename to media/media_codecs_performance.xml
diff --git a/configs/media/media_profiles.xml b/media/media_profiles.xml
similarity index 100%
rename from configs/media/media_profiles.xml
rename to media/media_profiles.xml
diff --git a/configs/media/media_profiles_V1_0.xml b/media/media_profiles_V1_0.xml
similarity index 100%
rename from configs/media/media_profiles_V1_0.xml
rename to media/media_profiles_V1_0.xml
diff --git a/configs/media/media_profiles_vendor.xml b/media/media_profiles_vendor.xml
similarity index 100%
rename from configs/media/media_profiles_vendor.xml
rename to media/media_profiles_vendor.xml