Moved Classes for AddressDataStore and AddressEntry to external files