refactored to use address data store class
changed address data store class to inherit from filestore class
moved classes to inc