After some more review figured no need to pass the oldfolder. Just call it before _move() changes it to the new one.