Move/remove files
Fix async behaviour