Refactored.  Implemented Company data structure.