Refactor model package structure and update imports across services, repositories, and mappers