- refactored controller and annotation rules
- AnnotationEditor now uses controller