Add support for file moving - not working well