refactoring Model package