Merge "Restructure move to nested virt nodes"