Message updated back to case classes of Events, instead of case objects. Removed few obsolete files.