diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk
index f73666c..8099b7f 100644
--- a/universal7885-common/BoardConfigCommon.mk
+++ b/universal7885-common/BoardConfigCommon.mk
@@ -72,7 +72,10 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_FLASH_BLOCK_SIZE := 131072
 
 # Properties
-include device/samsung/universal7885-common/configs/props/props.mk
+BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
+TARGET_PRODUCT_PROP += $(COMMON_PATH)/product.prop
+TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop
+TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop
 
 # Recovery
 BOARD_HAS_DOWNLOAD_MODE := true
diff --git a/universal7885-common/configs/permissions/component-overrides-bluetooth.xml b/universal7885-common/configs/permissions/component-overrides-bluetooth.xml
deleted file mode 100644
index 4e60b93..0000000
--- a/universal7885-common/configs/permissions/component-overrides-bluetooth.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source 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.
--->
-<config>
-    <component-override package="com.android.bluetooth" >
-    	<component class=".a2dpsink.A2dpSinkService" enabled="false" />
-        <component class=".avrcpcontroller.AvrcpControllerService" enabled="false" />
-        <component class=".avrcpcontroller.BluetoothMediaBrowserService" enabled="false" />
-        <component class=".hfpclient.connserv.HeadsetClientService" enabled="false" />
-	<component class=".hfpclient.HeadsetClientService" enabled="false" />
-	<component class=".hfpclient.connserv.HfpClientConnectionService" enabled="false" />
-        <component class=".sap.SapService" enabled="true" />
-    </component-override>
-</config>
diff --git a/universal7885-common/configs/permissions/platform-samsung.xml b/universal7885-common/configs/permissions/platform-samsung.xml
deleted file mode 100644
index c88c33c..0000000
--- a/universal7885-common/configs/permissions/platform-samsung.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source 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.
--->
-
-<!-- This file is used to define the mappings between lower-level system
-     user and group IDs and the higher-level permission names managed
-     by the platform.
-     Be VERY careful when editing this file!  Mistakes made here can open
-     big security holes.
--->
-<permissions>
-    <assign-permission name="com.samsung.permission.HRM_EXT" uid="cameraserver" />
-    <assign-permission name="com.samsung.permission.SSENSOR" uid="cameraserver" />
-</permissions>
diff --git a/universal7885-common/configs/props/props.mk b/universal7885-common/configs/props/props.mk
deleted file mode 100644
index 65fcc7a..0000000
--- a/universal7885-common/configs/props/props.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-PROPS_PATH := device/samsung/universal7885-common/configs/props
-
-BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
-TARGET_PRODUCT_PROP += $(PROPS_PATH)/product.prop
-TARGET_VENDOR_PROP += $(PROPS_PATH)/vendor.prop
-TARGET_SYSTEM_PROP += $(PROPS_PATH)/system.prop
diff --git a/universal7885-common/configs/props/product.prop b/universal7885-common/product.prop
similarity index 100%
rename from universal7885-common/configs/props/product.prop
rename to universal7885-common/product.prop
diff --git a/universal7885-common/configs/props/system.prop b/universal7885-common/system.prop
similarity index 100%
rename from universal7885-common/configs/props/system.prop
rename to universal7885-common/system.prop
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index c70b6b2..d48c6a1 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -73,10 +73,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     libsuspend
 
-# Component overrides
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/permissions/component-overrides-bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides-bluetooth.xml
-
 # Debug
 PRODUCT_PACKAGES += debug_daemon
 
@@ -226,8 +222,7 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.picture_in_picture.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.picture_in_picture.xml \
     frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml \
     frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
-    frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
-    $(LOCAL_PATH)/configs/permissions/platform-samsung.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/platform-samsung.xml
+    frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
 
 # Power
 PRODUCT_PACKAGES += \
diff --git a/universal7885-common/configs/props/vendor.prop b/universal7885-common/vendor.prop
similarity index 100%
rename from universal7885-common/configs/props/vendor.prop
rename to universal7885-common/vendor.prop