clean up naming conventions for spreadsheet column names
move fixture data to separate files