I am attempting to cherry-pick a commit from one repo to another, but the 2 repos unfortunately differ by one directory level (but are otherwise very similar), i.e. there is an extra directory at the top of the directory structure in the repo which will be receiving the commit. Is there a way to account for this different directory structure when performing the cherry pick, or is this going to be a manual file change operation?