fix structure class names, fix docs