Major modification of data structures,

csv files corrected.