Refactor share repo