rename vdiagram to diagram, now that loading order has been fixed