change the skeleton, nothing of real substance.

re-arrange the source file and the header file.  A lot need to be
maintained. Go on tomorrow.