OGM-342 Moving annotation converters into "impl" package