Add AnnotationUtils and start to move code there