Touchups: finding files for bin/test
File reorg.