Cleaning up classes structs. Added JavaDocs as well.