Refactoring model packages