[Bug 458892] Repositories module refactoring