v2.0.x: move util/reader -> parser