Can confirm that the output of c2rust currently suffer because the refactoring tool needs to be revived. We will get to it eventually but we don't have a firm date :/