reworked project hierarchy