Moving registrars to modules