Started refactoring event module. Deleted testing for now since everything has changed so much - will re-implement all tests when refactoring is done.