Fixed project hierarchy