Refactoring renamed package from dao to model++