move annotations to client package