Reorganize tests directory structure