Restructure for logstash puppet module