More organizational changes for 3.0