*8138* Fixed class names, missing classes directory