- begin refactoring to decouple the annotation processing further
- couple of unit tests failing, which need to be fixed.