Refactoring repository to standard format.