Docs: added some annotations and fixed class layouts