refactor(discovery): servers