move files into flat file structure for 4.2
White space cleanup
Fixes to packaging files
first cut restructure to 4.2 - in progress