Big refactoring to bring in multiple log-file parsers