Code repair
Made Event POJO
Other classes
Other classes
Unit tests