refactored contact model and collection to entity module