Move annotations to a separate package