Labor's long-serving climate spokesperson Mark Butler has been shifted from the portfolio as part of an Opposition reshuffle on the eve of Federal Parliament's return.