reworked project tree