reorganized test directories
reorganized test directories