retructure puppet modules