Major refactoring on reader and GTP parser (still in progress)