Move events to their own package
Rename gunhud and trigger combat based on an event