done first pass in dividing files - no changes to functions -