Separate classes among files; New 5 CSV format