Correct the mix-up with class files