Refactor out countries to separate yaml file