Rearrange CountryRepository