Refactor Droplets
Add some extra event structures and rename some other event structures to make way for the extended event info