Added package info to mix
Renames builder to xml_builder