Moved things in struct, amended README.