Finished adding structs except for some script ones, that may or may not be needed.