move classes to event, and update composer