created model package, refactored