Use shutil to do the move
Add missing fi