Took out hard-coding of import file layout.