Tweaks to build tool; move a file that was still in the old, wrong place.