Refactoring google sync components