add better structure to the puppetx tree