Add post-move modifications

MSP-9228

Git FAIL on my part: checked in the renames, but didn't stage the
internal renames in the files before committing.