[APOLLO-2321] - added new entity for correspondence and annotations for ...

...relationships. Fixed CS on classes were code was changed.