Disks, toroids and the formation of massive stars