Make OM and M Annotation classes public

In order to be properly tested, these classes need
to be made public. This is also the beginning of the
definition of their public API which will also be
further defined via ticket 4536