Refactor annotation packages [ci skip]