Renaming annotations
and reorganizing annotations into a separated file