Moved registrar out to the top level