Refactor event annotations package [ci skip]