Moving stuff around so it's only the gol project