move contest and sample data to subdirectories
finally have the right combination of contest data files
made all tests pass