231150 extract CivicrmEntity class to separate file