fixed up class paths