Re-arrange things.