renamed files and added events and aggregatation
fixed bug in queue, and added aggregate queue tests