diff --git a/cupid.xml b/cupid.xml
deleted file mode 100644
index 9374dde..0000000
--- a/cupid.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <!-- Device trees -->
-  <project name="android_device_xiaomi_cupid" path="device/xiaomi/cupid" remote="j7b3y" revision="cr11" />
-  <project name="android_device_xiaomi_sm8450-common" path="device/xiaomi/sm8450-common" remote="j7b3y" revision="cr11" />
-
-  <!-- Xiaomi common hardware -->
-  <project path="hardware/xiaomi" name="crdroidandroid/android_hardware_xiaomi" remote="github" revision="15.0" />
-
-  <!-- Kernel -->
-  <project name="cupid-development/android_kernel_xiaomi_sm8450" path="kernel/xiaomi/sm8450" remote="github" revision="lineage-22.0" />
-  <project name="cupid-development/android_kernel_xiaomi_sm8450-devicetrees" path="kernel/xiaomi/sm8450-devicetrees" remote="github" revision="lineage-22.0" />
-  <project name="cupid-development/android_kernel_xiaomi_sm8450-modules" path="kernel/xiaomi/sm8450-modules" remote="github" revision="lineage-22.0" />
-
-  <!-- Vendor -->
-  <project name="proprietary_vendor_xiaomi_cupid" path="vendor/xiaomi/cupid" remote="j7b3y" revision="lineage-22.0" />
-  <project name="proprietary_vendor_xiaomi_sm8450-common" path="vendor/xiaomi/sm8450-common" remote="j7b3y" revision="lineage-22.0" />
-
-  <!-- MiuiCam-->
-  <project name="cupid-development/android_device_xiaomi_miuicamera-cupid" path="device/xiaomi/miuicamera-cupid" remote="github" revision="lineage-21" />
-  <project name="proprietary_vendor_xiaomi_miuicamera-cupid" path="vendor/xiaomi/miuicamera-cupid" remote="j7b3y" revision="lineage-21" />
-</manifest>
\ No newline at end of file
diff --git a/e1q.xml b/e1q.xml
new file mode 100644
index 0000000..9255144
--- /dev/null
+++ b/e1q.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remove-project path="hardware/samsung/nfc" />
+  <remove-project path="hardware/qcom-caf/common" />
+
+  <!-- Device trees -->
+  <project name="android_device_samsung_e1q" path="device/samsung/e1q" remote="j7b3y" revision="lineage-22.1" />
+  <!-- Samsung common hardware -->
+  <project path="device/qcom/sepolicy_vndr/sm8650" name="samsung-sm8650/android_device_qcom_sepolicy_vndr" remote="github" revision="lineage-22.1-caf-sm8650" />
+  <project name="samsung-sm8650/android_hardware_samsung" path="hardware/samsung" revision="lineage-22.1" remote="github"/>
+  <project name="LineageOS/android_hardware_samsung_nfc" path="hardware/samsung/nfc" revision="lineage-22.1" remote="github"/>
+  
+  <project name="samsung-sm8650/android_hardware_qcom_audio-ar" path="hardware/qcom-caf/sm8650/audio/primary-hal" revision="lineage-22.1-caf-sm8650" remote="github"/>
+  <project name="samsung-sm8650/android_hardware_qcom-caf_common" path="hardware/qcom-caf/common" revision="lineage-22.1" remote="github">
+        <linkfile src="os_pickup_aosp.mk" dest="hardware/qcom/Android.mk" />
+        <linkfile src="os_pickup_sepolicy_vndr.mk" dest="device/qcom/sepolicy_vndr/SEPolicy.mk" />
+        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/msm8953/Android.bp" />
+        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/msm8953/Android.mk" />
+        <linkfile src="os_pickup.bp" dest="hardware/qcom-caf/msm8996/Android.bp" />
+        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/msm8996/Android.mk" />
+        <linkfile src="os_pickup.bp" dest="hardware/qcom-caf/msm8998/Android.bp" />
+        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/msm8998/Android.mk" />
+        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sdm660/Android.bp" />
+        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sdm660/Android.mk" />
+        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sdm845/Android.bp" />
+        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sdm845/Android.mk" />
+        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sm8150/Android.bp" />
+        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sm8150/Android.mk" />
+        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sm8250/Android.bp" />
+        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sm8250/Android.mk" />
+        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sm8350/Android.bp" />
+        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sm8350/Android.mk" />
+        <linkfile src="os_pickup_audio-ar.mk" dest="hardware/qcom-caf/sm8450/audio/Android.mk" />
+        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sm8450/Android.bp" />
+        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sm8450/Android.mk" />
+        <linkfile src="os_pickup_audio-ar.mk" dest="hardware/qcom-caf/sm8550/audio/Android.mk" />
+        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sm8550/Android.bp" />
+        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sm8550/Android.mk" />
+        <linkfile src="os_pickup_audio-ar.mk" dest="hardware/qcom-caf/sm8650/audio/Android.mk" />
+        <linkfile src="os_pickup_qssi.bp" dest="hardware/qcom-caf/sm8650/Android.bp" />
+        <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sm8650/Android.mk" />
+    </project>
+
+  <project name="samsung-sm8650/android_hardware_qcom_display" path="hardware/qcom-caf/sm8650/display" revision="lineage-22.1-caf-sm8650" remote="github"/>
+  <project name="samsung-sm8650/android_hardware_qcom_media" path="hardware/qcom-caf/sm8650/media" revision="lineage-22.1-caf-sm8650" remote="github"/>
+  <project name="samsung-sm8650/android_vendor_qcom_opensource_agm" path="hardware/qcom-caf/sm8650/audio/agm" revision="lineage-22.1-caf-sm8650" remote="github"/>
+  <project name="samsung-sm8650/android_vendor_qcom_opensource_arpal-lx" path="hardware/qcom-caf/sm8650/audio/pal" revision="lineage-22.1-caf-sm8650" remote="github"/>
+  <project name="samsung-sm8650/android_vendor_qcom_opensource_data-ipa-cfg-mgr" path="hardware/qcom-caf/sm8650/data-ipa-cfg-mgr" revision="lineage-22.1-caf-sm8650" remote="github"/>
+  <project name="samsung-sm8650/android_vendor_qcom_opensource_dataipa" path="hardware/qcom-caf/sm8650/dataipa" revision="lineage-22.1-caf-sm8650" remote="github"/>
+
+  <!-- Kernel -->
+  <project name="android_kernel_samsung_sm8650" path="kernel/samsung/sm8650" remote="j7b3y" revision="lineage-22.1" />
+  <project name="android_kernel_samsung_sm8650-devicetrees" path="kernel/samsung/sm8650-devicetrees" remote="j7b3y" revision="lineage-22.0" />
+  <project name="android_kernel_samsung_sm8650-modules" path="kernel/samsung/sm8650-modules" remote="j7b3y" revision="lineage-22.1" />
+
+  <!-- Vendor -->
+  <project name="proprietary_vendor_samsung_e1q" path="vendor/samsung/e1q" remote="j7b3y" revision="lineage-22.1" />
+</manifest>
diff --git a/lynx.xml b/lynx.xml
deleted file mode 100644
index e4b5ea5..0000000
--- a/lynx.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <!-- Device trees -->
-  <project name="android_device_google_lynx" path="device/google/lynx" remote="j7b3y" revision="cr11-5.10" />
-  <project name="LineageOS/android_device_google_gs201" path="device/google/gs201" remote="github" revision="lineage-22.0" />
-  <project name="LineageOS/android_device_google_gs101" path="device/google/gs101" remote="github" revision="lineage-22.0" />
-  <project name="LineageOS/android_device_google_gs-common" path="device/google/gs-common" remote="github" revision="lineage-22.0" />
-
-  <!-- Kernel -->
-  <project name="device/google/lynx-kernels/5.10" path="device/google/lynx-kernels/5.10" remote="aosp" revision="refs/tags/android-15.0.0_r8" />
-
-  <!-- Parts -->
-  <project name="Evolution-X-Devices/packages_apps_PixelParts" path="packages/apps/PixelParts" remote="github" revision="vic" />
-
-  <!-- Vendor-->
-  <project name="TheMuppets/proprietary_vendor_google_lynx" path="vendor/google/lynx" remote="github" revision="lineage-22.0" />
-</manifest>