Split Addressable into Resolvable and Routable type classes
Cosmetic (ish)