refactor events
continue refactoring project model
fix tests
Merge pull request #11 from alexandresalome/refactor-events

Refactor events