Few rearrangements of code.  Move to allow use all of C++ library.