Re-org references