Refactoring: moving notifications classes to correct package