Some tool rearrangements, etc.

2015-07-15