Changed a few classes to structs.