Rearrange some shell config.