Remake Country to City. and remove original City