Moved test code into test2 subdir.

This is just a bunch of file renames, with minimal
modifications.  It's not yet functional.
Fixed test2 build to fully work in new location.