Removed unnecessary queue class and added event queue to main