diff --git a/BoardConfig.mk b/BoardConfig.mk
index ec6c1c4..062e7c4 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -21,9 +21,7 @@ DEVICE_PATH := device/motorola/sanders
 BOARD_VENDOR := motorola-qcom
 
 # AIDs and CAPS
-TARGET_FS_CONFIG_GEN := \
-    $(DEVICE_PATH)/fs_config/mot_aids.txt \
-    $(DEVICE_PATH)/fs_config/file_caps.txt
+TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/config.fs
 
 # Platform
 TARGET_BOARD_PLATFORM := msm8953
diff --git a/fs_config/mot_aids.txt b/config.fs
similarity index 73%
rename from fs_config/mot_aids.txt
rename to config.fs
index d89f6f0..c1eca5c 100644
--- a/fs_config/mot_aids.txt
+++ b/config.fs
@@ -1,86 +1,110 @@
-#
-# Copyright (C) 2017 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-[AID_MOT_ACCY]
-value: 5000
-
-[AID_MOT_PWRIC]
-value: 5001
-
-[AID_MOT_USB]
-value: 5002
-
-[AID_MOT_DRM]
-value: 5003
-
-[AID_MOT_TCMD]
-value: 5004
-
-[AID_MOT_SEC_RTC]
-value: 5005
-
-[AID_MOT_TOMBSTONE]
-value: 5006
-
-[AID_MOT_TPAPI]
-value: 5007
-
-[AID_MOT_SECCLKD]
-value: 5008
-
-[AID_MOT_WHISPER]
-value: 5009
-
-[AID_MOT_CAIF]
-value: 5010
-
-[AID_MOT_DLNA]
-value: 5011
-
-[AID_MOT_ATVC]
-value: 5012
-
-[AID_MOT_DBVC]
-value: 5014
-
-[AID_FINGERP]
-value: 5015
-
-[AID_MOT_ESDFS]
-value: 5016
-
-[AID_MOT_ESDFS]
-value: 5016
-
-[AID_MOT_ESDFS]
-value: 5016
-
-[AID_POWER]
-value: 5017
-
-[AID_ITSON]
-value: 5018
-
-[AID_MOT_DTV]
-value: 5019
-
-[AID_MOT_MOD]
-value: 5020
-
-[AID_MOT_SHARED]
-value: 5323
-
-[AID_MOT_COMMON]
-value: 5341
+#
+# Copyright (C) 2017 The LineageOS Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+[AID_RFS]
+value:2951
+
+[AID_RFS_SHARED]
+value:2952
+
+[system/bin/imsdatadaemon]
+user: AID_SYSTEM
+group: AID_SYSTEM
+mode: 0755
+caps: NET_BIND_SERVICE
+
+[system/bin/ims_rtp_daemon]
+user: AID_SYSTEM
+group: AID_RADIO
+mode: 0755
+caps: NET_BIND_SERVICE
+
+[system/bin/pm-service]
+user: AID_SYSTEM
+group: AID_SYSTEM
+mode: 0755
+caps: NET_BIND_SERVICE
+
+[AID_MOT_ACCY]
+value: 5000
+
+[AID_MOT_PWRIC]
+value: 5001
+
+[AID_MOT_USB]
+value: 5002
+
+[AID_MOT_DRM]
+value: 5003
+
+[AID_MOT_TCMD]
+value: 5004
+
+[AID_MOT_SEC_RTC]
+value: 5005
+
+[AID_MOT_TOMBSTONE]
+value: 5006
+
+[AID_MOT_TPAPI]
+value: 5007
+
+[AID_MOT_SECCLKD]
+value: 5008
+
+[AID_MOT_WHISPER]
+value: 5009
+
+[AID_MOT_CAIF]
+value: 5010
+
+[AID_MOT_DLNA]
+value: 5011
+
+[AID_MOT_ATVC]
+value: 5012
+
+[AID_MOT_DBVC]
+value: 5014
+
+[AID_FINGERP]
+value: 5015
+
+[AID_MOT_ESDFS]
+value: 5016
+
+[AID_MOT_ESDFS]
+value: 5016
+
+[AID_MOT_ESDFS]
+value: 5016
+
+[AID_POWER]
+value: 5017
+
+[AID_ITSON]
+value: 5018
+
+[AID_MOT_DTV]
+value: 5019
+
+[AID_MOT_MOD]
+value: 5020
+
+[AID_MOT_SHARED]
+value: 5323
+
+[AID_MOT_COMMON]
+value: 5341
diff --git a/fs_config/file_caps.txt b/fs_config/file_caps.txt
deleted file mode 100644
index aa35591..0000000
--- a/fs_config/file_caps.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2017 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-[AID_RFS]
-value:2951
-
-[AID_RFS_SHARED]
-value:2952
-
-[system/bin/imsdatadaemon]
-user: AID_SYSTEM
-group: AID_SYSTEM
-mode: 0755
-caps: NET_BIND_SERVICE
-
-[system/bin/ims_rtp_daemon]
-user: AID_SYSTEM
-group: AID_RADIO
-mode: 0755
-caps: NET_BIND_SERVICE
-
-[system/bin/pm-service]
-user: AID_SYSTEM
-group: AID_SYSTEM
-mode: 0755
-caps: NET_BIND_SERVICE