Ckozak/compliance event

> that todo has been there for a long time, I just moved entityToJson back to eventFactory from EventBuilder so we can use it for compliance data

ACK