IDEX-811; IDEX-706: rework project's node hierarchy