Refactoring project... create model and service packages...