added classifier files, split query returns rows as tuples
merged changes