Re-organize sections