latest update.
Lots of initial re-arranging of code into sub-folders.