Completed the repository refactoring.