Code refactoring
Merge pull request #1 from ragnar123/testing

Code refactoring, testing Event classes