Change structure of listeners and events