package refactoring / annotation templates