Refactor into parent repository