Continues refactoring, including renaming RigidBodyDragForce to RigidBodyBluffBody