Start refactoring services/business