style and structure updates.  file renaming