Fix conductor spec due to interface changes
Move events to sub directory and add event class