Refactoring Senses modules