I'd suggest making a PR that just copies over the methods to the new file
in the state they are in before your changes, leaving them part of the
vehicle class, should be trivial to do and remain compilable unless they're
calling static methods or variables.  Then applying your changes on top of
that should result in a much smaller diff.