refactor entities in model package