Refactoring toward a Domain Model