Split AddressMapper out of BuildFileParser