Updated project hierarchy