diff --git a/Samsung/A40/res/values/bools.xml b/Samsung/A40/res/values/bools.xml
deleted file mode 100644
index bef0ed5..0000000
--- a/Samsung/A40/res/values/bools.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_fillMainBuiltInDisplayCutout">true</bool>
-    <bool name="config_showNavigationBar">true</bool>
-    <bool name="config_useDevInputEventForAudioJack">false</bool>
-    <bool name="config_wifi_background_scan_support">true</bool>
-    <bool name="config_wifi_dual_band_support">true</bool>
-    <bool name="config_wifi_fast_bss_transition_enabled">true</bool>
-    <bool name="config_enableBurnInProtection">true</bool>
-    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
-    <bool name="config_dozePulsePickup">true</bool>
-    <bool name="config_automatic_brightness_available">true</bool>
-</resources>
diff --git a/Samsung/A40/res/values/arrays.xml b/Samsung/A40/res/values/brightness.xml
similarity index 91%
rename from Samsung/A40/res/values/arrays.xml
rename to Samsung/A40/res/values/brightness.xml
index 23d1f3d..2478a94 100644
--- a/Samsung/A40/res/values/arrays.xml
+++ b/Samsung/A40/res/values/brightness.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <bool name="config_automatic_brightness_available">true</bool>
+    <integer name="config_screenBrightnessDim">15</integer>
+    <integer name="config_screenBrightnessSettingDefault">128</integer>
+    <integer name="config_screenBrightnessSettingMaximum">255</integer>
+    <integer name="config_screenBrightnessSettingMinimum">0</integer>
     <integer-array name="config_autoBrightnessDisplayValuesNits">
         <item>10</item>
         <item>11</item>
@@ -68,10 +73,6 @@
         <item>30000</item>
         <item>40000</item>
     </integer-array>
-    <string-array name="config_mobile_tcp_buffers">
-        <item>5gnr:2097152,6291456,16777216,512000,2097152,8388608</item>
-        <item>lte:2097152,4194304,8388608,1048576,3145728,4194304</item>
-    </string-array>
     <integer-array name="config_screenBrightnessBacklight">
         <item>0</item>
         <item>1</item>
@@ -588,32 +589,4 @@
         <item>419</item>
         <item>420</item>
     </integer-array>
-    <string-array name="config_tether_usb_regexs">
-        <item>rndis0</item>
-    </string-array>
-    <string-array name="config_tether_wifi_regexs">
-        <item>wlan0</item>
-    </string-array>
-    <string-array name="networkAttributes">
-        <item>wifi,1,1,1,-1,true</item>
-        <item>mobile,0,0,0,-1,true</item>
-        <item>mobile_mms,2,0,2,240000,true</item>
-        <item>mobile_supl,3,0,2,60000,true</item>
-        <item>mobile_dun,4,0,2,60000,true</item>
-        <item>mobile_hipri,5,0,3,60000,true</item>
-        <item>bluetooth,7,7,0,-1,true</item>
-        <item>ethernet,9,9,2,-1,true</item>
-        <item>mobile_fota,10,0,2,60000,true</item>
-        <item>mobile_ims,11,0,1,-1,true</item>
-        <item>mobile_cbs,12,0,2,60000,true</item>
-        <item>wifi_p2p,13,1,0,-1,true</item>
-        <item>mobile_ia,14,0,2,-1,true</item>
-        <item>mobile_emergency,15,0,2,-1,true</item>
-        <item>mobile_bip,23,0,2,60000,true</item>
-        <item>mobile_cas,24,0,3,60000,true</item>
-        <item>mobile_xcap,27,0,2,60000,true</item>
-        <item>mobile_ent1,28,0,2,-1,true</item>
-        <item>mobile_mcx,32,0,2,-1,true</item>
-        <item>mobile_foc,30,0,2,-1,true</item>
-    </string-array>
 </resources>
diff --git a/Samsung/A40/res/values/config.xml b/Samsung/A40/res/values/config.xml
new file mode 100644
index 0000000..5d3fbd3
--- /dev/null
+++ b/Samsung/A40/res/values/config.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_showNavigationBar">true</bool>
+    <bool name="config_useDevInputEventForAudioJack">false</bool>
+    <string-array name="config_tether_usb_regexs">
+        <item>rndis0</item>
+    </string-array>
+    <string-array name="config_tether_wifi_regexs">
+        <item>wlan0</item>
+    </string-array>
+</resources>
diff --git a/Samsung/A40/res/values/dimens.xml b/Samsung/A40/res/values/dimens.xml
deleted file mode 100644
index a18508c..0000000
--- a/Samsung/A40/res/values/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="rounded_corner_radius">0px</dimen>
-    <dimen name="status_bar_height_landscape">24.0dip</dimen>
-    <dimen name="status_bar_height_portrait">86.0px</dimen>
-</resources>
diff --git a/Samsung/A40/res/values/doze.xml b/Samsung/A40/res/values/doze.xml
new file mode 100644
index 0000000..7ddffe2
--- /dev/null
+++ b/Samsung/A40/res/values/doze.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_enableBurnInProtection">true</bool>
+    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
+    <bool name="config_dozePulsePickup">true</bool>
+</resources>
diff --git a/Samsung/A40/res/values/integers.xml b/Samsung/A40/res/values/integers.xml
deleted file mode 100644
index f3c0f2a..0000000
--- a/Samsung/A40/res/values/integers.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <integer name="config_screenBrightnessDim">15</integer>
-    <integer name="config_screenBrightnessSettingDefault">128</integer>
-    <integer name="config_screenBrightnessSettingMaximum">255</integer>
-    <integer name="config_screenBrightnessSettingMinimum">0</integer>
-</resources>
diff --git a/Samsung/A40/res/values/network.xml b/Samsung/A40/res/values/network.xml
new file mode 100644
index 0000000..b1ba0b0
--- /dev/null
+++ b/Samsung/A40/res/values/network.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_wifi_background_scan_support">true</bool>
+    <bool name="config_wifi_dual_band_support">true</bool>
+    <bool name="config_wifi_fast_bss_transition_enabled">true</bool>
+    <string-array name="config_mobile_tcp_buffers">
+        <item>5gnr:2097152,6291456,16777216,512000,2097152,8388608</item>
+        <item>lte:2097152,4194304,8388608,1048576,3145728,4194304</item>
+    </string-array>
+    <string-array name="networkAttributes">
+        <item>wifi,1,1,1,-1,true</item>
+        <item>mobile,0,0,0,-1,true</item>
+        <item>mobile_mms,2,0,2,240000,true</item>
+        <item>mobile_supl,3,0,2,60000,true</item>
+        <item>mobile_dun,4,0,2,60000,true</item>
+        <item>mobile_hipri,5,0,3,60000,true</item>
+        <item>bluetooth,7,7,0,-1,true</item>
+        <item>ethernet,9,9,2,-1,true</item>
+        <item>mobile_fota,10,0,2,60000,true</item>
+        <item>mobile_ims,11,0,1,-1,true</item>
+        <item>mobile_cbs,12,0,2,60000,true</item>
+        <item>wifi_p2p,13,1,0,-1,true</item>
+        <item>mobile_ia,14,0,2,-1,true</item>
+        <item>mobile_emergency,15,0,2,-1,true</item>
+        <item>mobile_bip,23,0,2,60000,true</item>
+        <item>mobile_cas,24,0,3,60000,true</item>
+        <item>mobile_xcap,27,0,2,60000,true</item>
+        <item>mobile_ent1,28,0,2,-1,true</item>
+        <item>mobile_mcx,32,0,2,-1,true</item>
+        <item>mobile_foc,30,0,2,-1,true</item>
+    </string-array>
+</resources>
diff --git a/Samsung/A40/res/values/strings.xml b/Samsung/A40/res/values/notch.xml
similarity index 60%
rename from Samsung/A40/res/values/strings.xml
rename to Samsung/A40/res/values/notch.xml
index 87e5645..b23486b 100644
--- a/Samsung/A40/res/values/strings.xml
+++ b/Samsung/A40/res/values/notch.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="rounded_corner_radius">0px</dimen>
+    <dimen name="status_bar_height_landscape">24.0dip</dimen>
+    <dimen name="status_bar_height_portrait">86.0px</dimen>
+    <bool name="config_fillMainBuiltInDisplayCutout">true</bool>
     <string name="config_mainBuiltInDisplayCutout">M38,0c-4.2,0-5.6,0.3-5.6,0.3c-2.6,0.4-4.6,1.5-4.6,1.5c-3.3,1.6-4.6,4.8-4.6,4.8 c-1,1.8-1.8,5.9-1.8,5.9C18.8,21.8,10.2,28.7,0,28.7s-18.7-6.9-21.3-16.2c0,0-0.9-4.1-1.8-5.9 c0,0-1.4-3.1-4.6-4.8c0,0-2.1-1.1-4.6-1.5C-32.4,0.3,-33.8,0,-38,0Z @dp</string>
 </resources>