Refactoring to make project ready to work with EQ2 log files too