Move parsing classes into parser module