Allow file copies across file systems

Also... use rimraf because that now comes with mv

Change-Id: I95b198d9378d1969014aa162caca263462a5e878