Moved some Event-related classes to their own package