Remade the project so that everyones code was in the same project