added AnnotationResolver
removed extra files