Move annotations into more appropriate packages.