diff --git a/manifest.xml b/manifest.xml
index c476c3c..3808cec 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,44 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 <remote name="phh" fetch="https://github.com/phhusson/" />
+<!--
+     (device boot) means those contain device-specific fixes which are required to boot
+     (boot) means it is required to boot
+-->
 
-<remove-project name="platform/build" />
-<project path="build/make" name="platform_build" remote="phh" revision="android-vts-8.0_r4-phh">
-    <copyfile dest="Makefile" src="core/root.mk" />
-    <linkfile dest="build/CleanSpec.mk" src="CleanSpec.mk" />
-    <linkfile dest="build/buildspec.mk.default" src="buildspec.mk.default" />
-    <linkfile dest="build/core" src="core" />
-    <linkfile dest="build/envsetup.sh" src="envsetup.sh" />
-    <linkfile dest="build/target" src="target" />
-    <linkfile dest="build/tools" src="tools" />
-</project>
-
-<remove-project name="device/generic/armv7-a-neon" />
-<project path="device/generic/armv7-a-neon" name="device_generic_armv7-a-neon" remote="phh" revision="android-vts-8.0_r4-phh" />
-
+<!-- (device boot) Needed only for Essential PH-1 Oreo Beta 1 -->
 <remove-project name="platform/frameworks/av" />
 <project path="frameworks/av" name="platform_frameworks_av" remote="phh" revision="android-vts-8.0_r4-phh" />
 
+<!-- Needed to display FBE sdcard in MTP -->
 <remove-project name="platform/frameworks/base" />
 <project path="frameworks/base" name="platform_frameworks_base" remote="phh" revision="android-vts-8.0_r4-phh" />
 
+<!-- (device boot) To debug. Most probably SEPolicy one liner, huawei -->
 <remove-project name="platform/frameworks/opt/net/wifi" />
 <project path="frameworks/opt/net/wifi" name="platform_frameworks_opt_net_wifi" remote="phh" revision="android-vts-8.0_r4-phh" />
 
+<!-- (boot) Needed to disable dm-verity and adb auth on A/B devices, required for booting -->
 <remove-project name="platform/system/core" />
 <project path="system/core" name="platform_system_core" remote="phh" revision="android-vts-8.0_r4-phh" />
 
+<!-- (device boot) Needed for FBE on f2fs and sdcard. All upstreamed in 8.1 -->
 <remove-project name="platform/system/vold" />
 <project path="system/vold" name="platform_system_vold" remote="phh" revision="android-vts-8.0_r4-phh" />
 
+<!-- Required for tethering on Huawei -->
 <remove-project name="platform/system/netd" />
 <project path="system/netd" name="platform_system_netd" remote="phh" revision="android-vts-8.0_r4-phh" />
 
+<!-- Needed for multi-sim settings -->
 <remove-project name="platform/packages/services/Telephony" />
 <project path="packages/services/Telephony" name="platform_packages_services_Telephony" remote="phh" revision="android-vts-8.0_r4-phh" />
 
-<remove-project name="platform/system/sepolicy" />
-<project path="system/sepolicy" name="platform_system_sepolicy" remote="phh" revision="android-vts-8.0_r4-phh" />
-
 <project path="vendor/hardware_overlay" name="vendor_hardware_overlay" remote="phh" revision="master" />
+<project path="device/phh/treble" name="device_phh_treble" remote="phh" revision="android-8.0" />
 </manifest>