Reorganize tests directory