reorganizing to take better advantage of VCS