Renamed some files, and added ability for each event queue to have custom data