move Vehicle, Car, Locomotive to "abstraction" package