WCM-77

WCM-77 Improve repo refactor