Reorganize test directory structure