Reorganization of tests into directories.