re-org references