Merge pull request #105 from xi-project/backend-refactor

Backend refactor
Merge remote-tracking branch 'origin/master' into sanitize-event-names