Did some fixups on various modules.
Changed logstash logging to json logging
forgot a file
Made some more changes for the logging change