restructured project hierarchy