Organized mass in a separate struct and added collider base class.