Packages refactoring, new package: model