Refactor model package