Refactor nfs mounts