Refactored repo structure