IN PROGRESS.  more file re-structuring.