Convert rest and handlers to use new event structure