IDEX-706, IDEX-811: Rework project tree