Refactoring Annotation and Architecture