Reorganize event types.

This implements the engine changes as of https://github.com/clintbellanger/flare-engine/pull/633