just moved some of the project hierarchy around