Refactoring of repository imports