diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 1e46e2c..0211f3d 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -52,6 +52,8 @@ TARGET_KERNEL_CLANG_COMPILE := true
# HIDL
DEVICE_FRAMEWORK_MANIFEST_FILE := $(COMMON_PATH)/framework_manifest.xml
+DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml
+DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml
# LMKD stats logging
TARGET_LMKD_STATS_LOG := true
diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
new file mode 100644
index 0000000..c83d975
--- /dev/null
+++ b/compatibility_matrix.xml
@@ -0,0 +1,87 @@
+
+
+
+ android.frameworks.displayservice
+ 1.0
+
+ IDisplayService
+ default
+
+
+
+ android.frameworks.schedulerservice
+ 1.0
+
+ ISchedulingPolicyService
+ default
+
+
+
+ android.frameworks.sensorservice
+ 1.0
+
+ ISensorManager
+ default
+
+
+
+ android.hardware.graphics.composer
+ 2.1
+
+ IComposer
+ vr
+
+
+
+ android.hidl.allocator
+ 1.0
+
+ IAllocator
+ ashmem
+
+
+
+ android.hidl.manager
+ 1.0
+
+ IServiceManager
+ default
+
+
+
+ android.hidl.memory
+ 1.0
+
+ IMapper
+ ashmem
+
+
+
+ android.hidl.token
+ 1.0
+
+ ITokenManager
+ default
+
+
+
+ android.system.wifi.keystore
+ 1.0
+
+ IKeystore
+ default
+
+
+
+ vendor.samsung.frameworks.security.dsms
+ 1.0
+
+ ISehDsms
+ default
+
+
+
diff --git a/manifest.xml b/manifest.xml
new file mode 100644
index 0000000..e7402aa
--- /dev/null
+++ b/manifest.xml
@@ -0,0 +1,539 @@
+
+
+ android.hardware.audio
+ hwbinder
+ 2.0
+
+ IDevicesFactory
+ default
+
+ @2.0::IDevicesFactory/default
+
+
+ android.hardware.audio.effect
+ hwbinder
+ 2.0
+
+ IEffectsFactory
+ default
+
+ @2.0::IEffectsFactory/default
+
+
+ android.hardware.biometrics.fingerprint
+ hwbinder
+ 2.1
+
+ IBiometricsFingerprint
+ default
+
+ @2.1::IBiometricsFingerprint/default
+
+
+ android.hardware.bluetooth
+ hwbinder
+ 1.0
+
+ IBluetoothHci
+ default
+
+ @1.0::IBluetoothHci/default
+
+
+ android.hardware.camera.provider
+ hwbinder
+ 2.5
+
+ ICameraProvider
+ legacy/0
+
+ @2.5::ICameraProvider/legacy/0
+
+
+ android.hardware.configstore
+ hwbinder
+ 1.1
+
+ ISurfaceFlingerConfigs
+ default
+
+ @1.1::ISurfaceFlingerConfigs/default
+
+
+ android.hardware.drm
+ hwbinder
+ 1.0
+
+ ICryptoFactory
+ default
+
+
+ IDrmFactory
+ default
+
+ @1.0::ICryptoFactory/default
+ @1.0::IDrmFactory/default
+ @1.2::ICryptoFactory/clearkey
+ @1.2::ICryptoFactory/widevine
+ @1.2::IDrmFactory/clearkey
+ @1.2::IDrmFactory/widevine
+
+
+ android.hardware.gatekeeper
+ hwbinder
+ 1.0
+
+ IGatekeeper
+ default
+
+ @1.0::IGatekeeper/default
+
+
+ android.hardware.gnss
+ hwbinder
+ 2.0
+
+ IGnss
+ default
+
+ @1.1::IGnss/default
+ @2.0::IGnss/default
+
+
+ android.hardware.graphics.allocator
+ hwbinder
+ 2.0
+
+ IAllocator
+ default
+
+ @2.0::IAllocator/default
+
+
+ android.hardware.graphics.composer
+ hwbinder
+ 2.1
+
+ IComposer
+ default
+
+ @2.1::IComposer/default
+
+
+ android.hardware.graphics.mapper
+ passthrough
+ 2.0
+
+ IMapper
+ default
+
+ @2.0::IMapper/default
+
+
+ android.hardware.health
+ hwbinder
+ 2.0
+
+ IHealth
+ default
+ sehhealth
+
+ @2.0::IHealth/default
+ @2.0::IHealth/sehhealth
+
+
+ android.hardware.keymaster
+ hwbinder
+ 3.0
+
+ IKeymasterDevice
+ default
+
+ @3.0::IKeymasterDevice/default
+
+
+ android.hardware.light
+ hwbinder
+ 2.0
+
+ ILight
+ default
+
+ @2.0::ILight/default
+
+
+ android.hardware.media.omx
+ hwbinder
+ 1.0
+
+ IOmx
+ default
+
+
+ IOmxStore
+ default
+
+ @1.0::IOmx/default
+ @1.0::IOmxStore/default
+
+
+ android.hardware.memtrack
+ hwbinder
+ 1.0
+
+ IMemtrack
+ default
+
+ @1.0::IMemtrack/default
+
+
+ android.hardware.power
+ hwbinder
+ 1.0
+
+ IPower
+ default
+
+ @1.0::IPower/default
+
+
+ android.hardware.radio
+ hwbinder
+
+
+ android.hardware.radio
+ hwbinder
+ @1.2::ISap/slot1
+ @1.2::ISap/slot2
+ @1.4::IRadio/slot1
+ @1.4::IRadio/slot2
+
+
+ android.hardware.radio.config
+ hwbinder
+ 1.1
+
+ IRadioConfig
+ default
+
+ @1.1::IRadioConfig/default
+
+
+ android.hardware.radio.deprecated
+ hwbinder
+
+
+ android.hardware.renderscript
+ passthrough
+ 1.0
+
+ IDevice
+ default
+
+ @1.0::IDevice/default
+
+
+ android.hardware.sensors
+ hwbinder
+ 1.0
+
+ ISensors
+ default
+
+ @1.0::ISensors/default
+
+
+ android.hardware.soundtrigger
+ hwbinder
+ 2.0
+
+ ISoundTriggerHw
+ default
+
+ @2.0::ISoundTriggerHw/default
+
+
+ android.hardware.thermal
+ hwbinder
+ 1.0
+
+ IThermal
+ default
+
+ @1.0::IThermal/default
+
+
+ android.hardware.usb
+ hwbinder
+ 1.1
+
+ IUsb
+ default
+
+ @1.1::IUsb/default
+
+
+ android.hardware.vibrator
+ hwbinder
+ 1.3
+
+ IVibrator
+ default
+
+ @1.3::IVibrator/default
+
+
+ android.hardware.wifi
+ hwbinder
+ 1.3
+
+ IWifi
+ default
+
+ @1.3::IWifi/default
+
+
+ android.hardware.wifi.hostapd
+ hwbinder
+ 1.1
+
+ IHostapd
+ default
+
+ @1.1::IHostapd/default
+
+
+ android.hardware.wifi.supplicant
+ hwbinder
+ 1.2
+
+ ISupplicant
+ default
+
+ @1.2::ISupplicant/default
+
+
+ vendor.samsung.hardware.audio
+ hwbinder
+ 1.0
+
+ ISehDevicesFactory
+ default
+
+ @1.0::ISehDevicesFactory/default
+
+
+ vendor.samsung.hardware.biometrics.fingerprint
+ hwbinder
+ 3.0
+
+ ISehBiometricsFingerprint
+ default
+
+ @3.0::ISehBiometricsFingerprint/default
+
+
+ vendor.samsung.hardware.camera.provider
+ hwbinder
+ 3.0
+
+ ISehCameraProvider
+ legacy/0
+
+ @3.0::ISehCameraProvider/legacy/0
+
+
+ vendor.samsung.hardware.gnss
+ hwbinder
+ 2.0
+
+ ISehGnss
+ default
+
+ @2.0::ISehGnss/default
+
+
+ vendor.samsung.hardware.health
+ hwbinder
+ 1.0
+
+ ISehHealth
+ sehhealth
+
+ @1.0::ISehHealth/sehhealth
+
+
+ vendor.samsung.hardware.light
+ hwbinder
+ 3.0
+
+ ISehLight
+ default
+
+ @3.0::ISehLight/default
+
+
+ vendor.samsung.hardware.miscpower
+ hwbinder
+ 2.0
+
+ ISehMiscPower
+ default
+
+ @2.0::ISehMiscPower/default
+
+
+ vendor.samsung.hardware.radio
+ hwbinder
+ 2.0
+
+ ISehRadio
+ slot1
+ slot2
+
+ @2.0::ISehRadio/slot1
+ @2.0::ISehRadio/slot2
+
+
+ vendor.samsung.hardware.radio.bridge
+ hwbinder
+ 2.0
+
+ ISehBridge
+ slot1
+ slot2
+
+ @2.0::ISehBridge/slot1
+ @2.0::ISehBridge/slot2
+
+
+ vendor.samsung.hardware.radio.channel
+ hwbinder
+ 2.0
+
+ ISehChannel
+ epdgd
+ epdgd2
+ imsd
+ imsd2
+
+ @2.0::ISehChannel/epdgd
+ @2.0::ISehChannel/epdgd2
+ @2.0::ISehChannel/imsd
+ @2.0::ISehChannel/imsd2
+
+
+ vendor.samsung.hardware.security.vaultkeeper
+ hwbinder
+ 1.0
+
+ ISehVaultKeeper
+ default
+
+ @1.0::ISehVaultKeeper/default
+
+
+ vendor.samsung.hardware.security.widevine.keyprovisioning
+ hwbinder
+ 1.0
+
+ ISehWidevineKeyProvisioning
+ default
+
+ @1.0::ISehWidevineKeyProvisioning/default
+
+
+ vendor.samsung.hardware.snap
+ hwbinder
+ 1.1
+
+ ISehSnap
+ default
+
+ @1.1::ISehSnap/default
+
+
+ vendor.samsung.hardware.vibrator
+ hwbinder
+ 2.0
+
+ ISehVibrator
+ default
+
+ @2.0::ISehVibrator/default
+
+
+ vendor.samsung.hardware.wifi
+ hwbinder
+ 2.0
+
+ ISehWifi
+ default
+
+ @2.0::ISehWifi/default
+
+
+ vendor.samsung.hardware.wifi.hostapd
+ hwbinder
+ 2.0
+
+ ISehHostapd
+ default
+
+ @2.0::ISehHostapd/default
+
+
+ vendor.samsung.hardware.wifi.supplicant
+ hwbinder
+ 2.0
+
+ ISehSupplicant
+ default
+
+ @2.0::ISehSupplicant/default
+
+
+ vendor.samsung_slsi.hardware.ExynosHWCServiceTW
+ hwbinder
+ 1.0
+
+ IExynosHWCServiceTW
+ default
+
+ @1.0::IExynosHWCServiceTW/default
+
+
+ vendor.samsung_slsi.hardware.configstore
+ hwbinder
+ 1.0
+
+ IExynosHWCConfigs
+ default
+
+ @1.0::IExynosHWCConfigs/default
+
+
+ vendor.samsung_slsi.hardware.radio
+ hwbinder
+
+
+ vendor.trustonic.tee
+ hwbinder
+ 1.0
+
+ ITee
+ default
+
+ @1.0::ITee/default
+
+
+ vendor.trustonic.teeregistry
+ hwbinder
+ 1.0
+
+ ITeeRegistry
+ default
+
+ @1.0::ITeeRegistry/default
+
+
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 4c127f0..2646417 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -240,9 +240,6 @@ vendor/etc/somxreg.conf
vendor/etc/str/str_preference_data.dat
vendor/etc/tms_audio_policy_configuration.xml
vendor/etc/usb_audio_policy_configuration.xml
-vendor/etc/vintf/compatibility_matrix.xml
-vendor/etc/vintf/manifest.xml
-vendor/etc/vintf/manifest/android.hardware.cas@1.1-service.xml
vendor/etc/wifi/hydra_config.sdb
vendor/etc/wifi/indoorchannel.info
vendor/etc/wifi/mx
@@ -707,5 +704,4 @@ vendor/lib64/vendor.samsung_slsi.hardware.configstore-utils.so
vendor/lib64/vendor.samsung_slsi.hardware.configstore@1.0.so
vendor/lib64/vendor.trustonic.tee@1.0.so
vendor/lib64/vendor.trustonic.teeregistry@1.0.so
-vendor/manifest.xml
vendor/ueventd.rc