Refactor working tree setup