Restructured test directories.