Reorganize event types.

This implements the proposal #626