Refactoring model to its own package