annotations must be just before class

patches to correct position of annotations.