Refactoring for multiple repositories introduction