Making 10854242 consistent with reality
Refactoring code review parser
Moving to a more sensible location