Refactoring to model package