refactored the account entity and a part of the feed module