More annotation refactoring
Moving annotation directory