Moved event queue into an event package