More Vex work, cleanup Chorus
Add back renamed file