Refactoring contact and deals into components.