Update and rename us-va-williamsburg-city.json to us-va-williamsburg.json