Reorganize test directory