Reorganized working tree