diff --git a/device.mk b/device.mk
index 40ce06eb..892bec62 100644
--- a/device.mk
+++ b/device.mk
@@ -15,9 +15,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk)
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.ipsec_tunnel_migration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnel_migration.xml
 
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += \
-    device/google/gs-common/vintf/framework_compatibility_matrix.xml
-
 # sscoredump
 PRODUCT_PROPERTY_OVERRIDES += vendor.debug.ssrdump.type=sscoredump
 
@@ -201,20 +198,6 @@ PRODUCT_VENDOR_PROPERTIES += \
 # b/295257834 Add HDR shaders to SurfaceFlinger's pre-warming cache
 PRODUCT_VENDOR_PROPERTIES += ro.surface_flinger.prime_shader_cache.ultrahdr=1
 
-# Device Manifest, Device Compatibility Matrix for Treble
-DEVICE_MANIFEST_FILE := \
-	device/google/gs201/manifest.xml
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-DEVICE_MANIFEST_FILE += \
-	device/google/gs201/manifest_radio_ds.xml
-endif
-
-DEVICE_MANIFEST_FILE += \
-	device/google/gs201/manifest_media.xml
-
-DEVICE_MATRIX_FILE := \
-	device/google/gs201/compatibility_matrix.xml
-
 DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay
 DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay-lineage
 
@@ -320,12 +303,6 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000
 PRODUCT_SOONG_NAMESPACES += \
     hardware/google/camera
 
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += \
-    device/google/gs-common/camera/device_framework_matrix_product.xml
-
-DEVICE_MATRIX_FILE += \
-    device/google/gs-common/camera/compatibility_matrix.xml
-
 # Connectivity
 PRODUCT_PACKAGES += \
         ConnectivityOverlay
@@ -338,8 +315,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     vendor.battery_mitigation.aidl.enable=true
 
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/battery_mitigation/compatibility_matrix.xml
-
 # storage pixelstats
 -include hardware/google/pixel/pixelstats/device.mk
 
@@ -546,9 +521,6 @@ PRODUCT_PACKAGES += \
 	android.hardware.health-service.gs201 \
 	android.hardware.health-service.gs201_recovery \
 
-# Audio HAL Server & Default Implementations
-DEVICE_MANIFEST_FILE += device/google/gs-common/audio/hidl/manifest.xml
-
 # Audio HAL configurations
 PRODUCT_COPY_FILES += \
     frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration_7_0.xml \
@@ -574,8 +546,6 @@ PRODUCT_PACKAGES += \
     audio.bluetooth.default \
     audio.r_submix.default
 
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/audio/hidl/device_framework_matrix_product.xml
-
 ## Audio properties
 ifneq (,$(filter %tangorpro, $(TARGET_PRODUCT)))
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -652,11 +622,6 @@ include hardware/google/pixel/common/pixel-common-device.mk
 # Wifi ext
 include hardware/google/pixel/wifi_ext/device.mk
 
-# Install product specific framework compatibility matrix
-# (TODO: b/169535506) This includes the FCM for system_ext and product partition.
-# It must be split into the FCM of each partition.
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs201/device_framework_matrix_product.xml
-
 # Keymint configuration
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \
@@ -668,10 +633,6 @@ PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled?=tr
 # Hardware Info
 include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
 
-# Touch service
-DEVICE_MANIFEST_FILE += device/google/gs-common/touch/twoshay/aidl/manifest_gs101.xml
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/touch/twoshay/aidl/compatibility_matrix_gs101.xml
-
 # Allow longer timeout for incident report generation in bugreport
 # Overriding in /product partition instead of /vendor intentionally,
 # since it can't be overridden from /vendor.
@@ -711,3 +672,13 @@ PRODUCT_PACKAGES += \
 
 # Touch
 include hardware/google/pixel/touch/device.mk
+
+# VINTF
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \
+    device/google/gs201/vintf/vendor_framework_compatibility_matrix.xml
+DEVICE_MANIFEST_FILE += \
+    device/google/gs201/vintf/manifest.xml
+DEVICE_MATRIX_FILE += \
+    device/google/gs201/vintf/compatibility_matrix.xml
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += \
+    device/google/gs201/vintf/device_framework_matrix_product.xml
diff --git a/manifest.xml b/manifest.xml
deleted file mode 100644
index e5a09381..00000000
--- a/manifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest version="1.0" type="device" target-level="7">
-    <hal format="aidl">
-        <name>android.hardware.boot</name>
-        <fqname>IBootControl/default</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>android.hardware.security.keymint</name>
-        <version>3</version>
-        <fqname>IRemotelyProvisionedComponent/strongbox</fqname>
-    </hal>
-</manifest>
diff --git a/manifest_media.xml b/manifest_media.xml
deleted file mode 100644
index 18588a69..00000000
--- a/manifest_media.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<manifest version="1.0" type="device">
-    <!-- AIDL fragment -->
-    <hal format="aidl">
-      <name>android.hardware.media.c2</name>
-      <version>1</version>
-      <fqname>IComponentStore/default1</fqname>
-    </hal>
-    <hal format="aidl">
-      <name>android.hardware.media.c2</name>
-      <version>1</version>
-      <fqname>IComponentStore/default</fqname>
-    </hal>
-</manifest>
diff --git a/manifest_radio_ds.xml b/manifest_radio_ds.xml
deleted file mode 100644
index de6fae5a..00000000
--- a/manifest_radio_ds.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.radio</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::ISap/slot1</fqname>
-        <fqname>@1.2::ISap/slot2</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>android.hardware.radio.config</name>
-        <fqname>IRadioConfig/default</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>android.hardware.radio.data</name>
-        <fqname>IRadioData/slot1</fqname>
-        <fqname>IRadioData/slot2</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>android.hardware.radio.messaging</name>
-        <fqname>IRadioMessaging/slot1</fqname>
-        <fqname>IRadioMessaging/slot2</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>android.hardware.radio.modem</name>
-        <fqname>IRadioModem/slot1</fqname>
-        <fqname>IRadioModem/slot2</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>android.hardware.radio.network</name>
-        <fqname>IRadioNetwork/slot1</fqname>
-        <fqname>IRadioNetwork/slot2</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>android.hardware.radio.sim</name>
-        <fqname>IRadioSim/slot1</fqname>
-        <fqname>IRadioSim/slot2</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>android.hardware.radio.voice</name>
-        <fqname>IRadioVoice/slot1</fqname>
-        <fqname>IRadioVoice/slot2</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.secure_element</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::ISecureElement/SIM1</fqname>
-        <fqname>@1.2::ISecureElement/SIM2</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.samsung_slsi.telephony.hardware.radioExternal</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.1::IOemSlsiRadioExternal/rilExternal</fqname>
-    </hal>
-</manifest>
diff --git a/compatibility_matrix.xml b/vintf/compatibility_matrix.xml
similarity index 73%
rename from compatibility_matrix.xml
rename to vintf/compatibility_matrix.xml
index 264e8547..a42ec0f0 100644
--- a/compatibility_matrix.xml
+++ b/vintf/compatibility_matrix.xml
@@ -1,12 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
-    Autogenerated skeleton compatibility matrix.
-    Use with caution. Modify it to suit your needs.
-    All HALs are set to optional.
-    Many entries other than HALs are zero-filled and
-    require human attention.
+     SPDX-FileCopyrightText: 2021 The Android Open Source Project
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
 -->
-<compatibility-matrix version="1.0" type="device">
-    <hal format="hidl" optional="true">
+<compatibility-matrix version="9.0" type="device">
+    <hal format="hidl">
         <name>android.frameworks.displayservice</name>
         <version>1.0</version>
         <interface>
@@ -14,7 +13,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="hidl">
         <name>android.frameworks.schedulerservice</name>
         <version>1.0</version>
         <interface>
@@ -22,7 +21,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="hidl">
         <name>android.frameworks.sensorservice</name>
         <version>1.0</version>
         <interface>
@@ -30,7 +29,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <version>2.1</version>
         <interface>
@@ -38,7 +37,7 @@
             <instance>vr</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="hidl">
         <name>android.hidl.allocator</name>
         <version>1.0</version>
         <interface>
@@ -46,7 +45,7 @@
             <instance>ashmem</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="hidl">
         <name>android.hidl.manager</name>
         <version>1.0</version>
         <interface>
@@ -54,7 +53,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="hidl">
         <name>android.hidl.memory</name>
         <version>1.0</version>
         <interface>
@@ -62,7 +61,7 @@
             <instance>ashmem</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="hidl">
         <name>android.hidl.token</name>
         <version>1.0</version>
         <interface>
@@ -70,7 +69,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="hidl">
         <name>android.system.wifi.keystore</name>
         <version>1.0</version>
         <interface>
@@ -78,7 +77,11 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <vndk>
-        <version>0.0.0</version>
-    </vndk>
+    <hal format="aidl">
+        <name>com.google.pixel.camera.services.binder</name>
+        <interface>
+            <name>IServiceBinder</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </compatibility-matrix>
diff --git a/device_framework_matrix_product.xml b/vintf/device_framework_matrix_product.xml
similarity index 60%
rename from device_framework_matrix_product.xml
rename to vintf/device_framework_matrix_product.xml
index d45d35e3..0f562c75 100644
--- a/device_framework_matrix_product.xml
+++ b/vintf/device_framework_matrix_product.xml
@@ -1,5 +1,11 @@
-<compatibility-matrix version="1.0" type="framework" level="7">
-    <hal format="hidl" optional="true">
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2021 The Android Open Source Project
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<compatibility-matrix version="9.0" type="framework" level="7">
+    <hal format="hidl">
         <name>android.vendor.samsung_slsi.telephony.hardware.radio</name>
         <version>1.1</version>
         <interface>
@@ -8,7 +14,7 @@
             <instance>slot2</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="hidl">
         <name>com.fingerprints42.extension</name>
         <version>1.0</version>
         <interface>
@@ -40,9 +46,24 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-      <name>com.google.face.debug</name>
-      <version>3-4</version>
+    <hal format="aidl">
+        <name>com.google.edgetpu</name>
+        <version>2</version>
+        <interface>
+            <name>IEdgeTpuVendorService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
+        <name>com.google.edgetpu.dba</name>
+        <interface>
+            <name>IDevice</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
+        <name>com.google.face.debug</name>
+        <version>3-4</version>
         <interface>
             <name>IDebugHost</name>
             <instance>default</instance>
@@ -52,39 +73,48 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-      <name>com.google.edgetpu</name>
+    <hal format="aidl">
+        <name>com.google.flood</name>
         <version>2</version>
         <interface>
-            <name>IEdgeTpuVendorService</name>
+            <name>IFloodService</name>
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-        <name>com.google.edgetpu.dba</name>
-        <version>1</version>
-        <interface>
-            <name>IDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="aidl" optional="true">
-        <name>com.google.edgetpu.tachyon</name>
-        <version>1</version>
-        <interface>
-            <name>IComputeService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="aidl" optional="true">
-      <name>com.google.hardware.pixel.display</name>
-        <version>13-16</version>
+    <hal format="aidl">
+        <name>com.google.hardware.pixel.display</name>
+        <version>16</version>
         <interface>
             <name>IDisplay</name>
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
+    <hal format="aidl">
+        <name>com.google.input</name>
+        <version>2-6</version>
+        <interface>
+            <name>ITouchContextService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
+        <name>com.google.input</name>
+        <version>6</version>
+        <interface>
+            <name>ITwoshayFileDumpService</name>
+            <instance>touchflow_default</instance>
+            <instance>touchflow_outer</instance>
+            <instance>twoshay</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
+        <name>com.google.pixel.camera.connectivity.hal.provider</name>
+        <interface>
+            <name>ICameraProvider</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
         <name>hardware.qorvo.uwb</name>
         <version>2</version>
         <interface>
@@ -92,7 +122,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="hidl">
         <name>vendor.goodix.hardware.biometrics.fingerprint</name>
         <version>2.1</version>
         <interface>
@@ -100,15 +130,30 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
+    <hal format="hidl">
+        <name>vendor.google.audiometricext</name>
+        <version>1.0</version>
+        <interface>
+            <name>IAudioMetricExt</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
+        <name>vendor.google.battery_mitigation</name>
+        <interface>
+            <name>IBatteryMitigation</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
         <name>vendor.google.google_battery</name>
-        <version>2-4</version>
+        <version>4</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="hidl">
         <name>vendor.google.radioext</name>
         <version>1.5</version>
         <interface>
@@ -116,7 +161,15 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
+    <hal format="hidl">
+        <name>vendor.google.whitechapel.audio.audioext</name>
+        <version>4.0</version>
+        <interface>
+            <name>IAudioExt</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
         <name>vendor.google.wifi_ext</name>
         <version>2-4</version>
         <interface>
@@ -124,7 +177,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="hidl">
         <name>vendor.samsung_slsi.telephony.hardware.oemservice</name>
         <version>1.0</version>
         <interface>
@@ -134,7 +187,7 @@
             <instance>sced0</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="hidl">
         <name>vendor.samsung_slsi.telephony.hardware.radioExternal</name>
         <version>1.1</version>
         <interface>
diff --git a/vintf/manifest.xml b/vintf/manifest.xml
new file mode 100644
index 00000000..4a2e50d0
--- /dev/null
+++ b/vintf/manifest.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2021 The Android Open Source Project
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest version="9.0" type="device" target-level="7">
+    <hal format="hidl">
+        <name>android.hardware.audio</name>
+        <transport>hwbinder</transport>
+        <fqname>@7.1::IDevicesFactory/default</fqname>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.audio.effect</name>
+        <transport>hwbinder</transport>
+        <fqname>@7.0::IEffectsFactory/default</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.boot</name>
+        <fqname>IBootControl/default</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.media.c2</name>
+        <fqname>IComponentStore/default1</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.media.c2</name>
+        <fqname>IComponentStore/default</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.security.keymint</name>
+        <version>3</version>
+        <fqname>IRemotelyProvisionedComponent/strongbox</fqname>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.soundtrigger</name>
+        <transport>hwbinder</transport>
+        <fqname>@2.3::ISoundTriggerHw/default</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>com.google.input</name>
+        <version>6</version>
+        <fqname>ITouchContextService/default</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>com.google.input</name>
+        <version>6</version>
+        <fqname>ITwoshayFileDumpService/touchflow_default</fqname>
+        <fqname>ITwoshayFileDumpService/twoshay</fqname>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.google.audiometricext</name>
+        <transport>hwbinder</transport>
+        <fqname>@1.0::IAudioMetricExt/default</fqname>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.google.whitechapel.audio.audioext</name>
+        <transport>hwbinder</transport>
+        <fqname>@4.0::IAudioExt/default</fqname>
+    </hal>
+</manifest>
diff --git a/vintf/vendor_framework_compatibility_matrix.xml b/vintf/vendor_framework_compatibility_matrix.xml
new file mode 100644
index 00000000..d605e899
--- /dev/null
+++ b/vintf/vendor_framework_compatibility_matrix.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<compatibility-matrix version="9.0" type="framework">
+    <hal format="aidl">
+        <name>aocx</name>
+        <version>1-2</version>
+        <interface>
+            <name>IAocx</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
+        <name>com.google.android.imageprocessing.hal</name>
+        <interface>
+            <name>IImageProcessingHal</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>