Begin restructing puppet module as per pro-puppet guidelines