Ranamed AnnotatedFieldScanner to AnnotationScanner
Updated import order