intel/genxml/bits: Refactor to add a container class