model base type and package refactoring