restructured code in puppet files