Fixed class file placement