keyring: Migrated away from single file for keyring management