Fixes to file moves