Update support files.
Remove unused support files.
Reorganize tests.