At the same time, move some more class and instance structs out of public headers.
Attach a file by drag & drop or click to upload
