moved data to structs header