[Raed667]

I gave up on assisted refactoring with VS Code, beyond the occasional rename-symbol, I just cut-paste manually.

Renaming and moving files usually auto-updates the imports though, but I could even live without that.