Refactor new_model package to model package