Fix class paths