(MAC) Refactor the project hierarchy.