refactored annotatedclassdictionary to use classinfo structures