[feature/external-remotes] Refactoring.