Fixed from default to libvirt section
Moved code to own class