restructured the puppetgitd flow