Refactor: Split Di/Annotation class.