Removed Event Group model.
cleaned up code
Merge pull request #1 from nicetigers/newEventModel

New event model