Refactoring and working on a remote server