Refactored repo structure.