Code resturcturing to have a separate sigmah puppet module for custom changes