Refactoring SourceControl