Move events to a sensible place