update to events.json, some changes to the repo structure
Merge remote-tracking branch 'upstream/master'