Reshuffle user-level changes to bring more important ones closer to the