more Model package refactorings