refactoring and introduction of remote services