Happy New Year
Simplify filenames
#17 Introduce test sets