Repository package refactoring.