Refactoring & network integration