Move around and refactor.  Prepping for more than one tool in
the source tree.