Clean up move_files and make sure it happens when it should.