There's a tricky part of the design of the upstreamer and I could use some advice. Please take a look at this and let me know if you have solution...

Help! How to deal with moved/renamed files? (with a proposal)

Thanks!