Reorganised AddressFiles to reside in LocationService