Clean up badcorpus test.
Begin reorg of test data.
Rename files.
Rename files.
First working test with new directory organization.