[mod-event-feeder] - Extract method & rename classes.