Corrected class paths.