refactor annotation paths some more