Working tree rearranged