Added file moving. Fixes Bug #269687.